diff --git a/src/keyboard_control.cpp b/src/keyboard_control.cpp
index afff61883..883a39729 100644
--- a/src/keyboard_control.cpp
+++ b/src/keyboard_control.cpp
@@ -37,6 +37,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
+ * @file
  * @todo
  * Consider using some abstraction over terminal control mainly because
  * differencies between Linux and Windows (ANSI mode or terminfo?)
diff --git a/src/video_display/gl.cpp b/src/video_display/gl.cpp
index d1735be5f..f0e2cebf5 100644
--- a/src/video_display/gl.cpp
+++ b/src/video_display/gl.cpp
@@ -350,6 +350,7 @@ static void glut_resize_window(bool fs, int height, double aspect, double window
 static void display_gl_set_sync_on_vblank(int value);
 static void screenshot(struct video_frame *frame);
 static void upload_texture(struct state_gl *s, char *data);
+static void display_gl_register_keyboard_ctl(struct module *mod);
 
 #ifdef HWACC_VDPAU
 static void gl_render_vdpau(struct state_gl *s, char *data) ATTRIBUTE(unused);
@@ -528,6 +529,7 @@ static void * display_gl_init(struct module *parent, const char *fmt, unsigned i
         }
 
         gl_load_splashscreen(s);
+        display_gl_register_keyboard_ctl(&s->mod);
 
         /* GLUT callbacks take only some arguments so we need static variable */
         gl = s;
@@ -883,6 +885,11 @@ static void glut_idle_callback(void)
                 if (strncasecmp(msg_univ->text, "win-title ", strlen("win_title ")) == 0) {
                         glutSetWindowTitle(msg_univ->text + strlen("win_title "));
                         r = new_response(RESPONSE_OK, NULL);
+                } else if (strstr(msg_univ->text, "fullscreen") != nullptr) {
+                        gl->fs = !gl->fs;
+                        glut_resize_window(gl->fs, gl->current_display_desc.height, gl->aspect,
+                                        gl->window_size_factor);
+                        r = new_response(RESPONSE_OK, NULL);
                 } else {
                         fprintf(stderr, "[GL] Unknown command received: %s\n", msg_univ->text);
                         r = new_response(RESPONSE_BAD_REQUEST, NULL);
@@ -1880,5 +1887,19 @@ static const struct video_display_info display_gl_info = {
         display_gl_reconfigure_audio,
 };
 
+static void display_gl_register_keyboard_ctl(struct module *mod) {
+        char my_path[1024];
+        if (!module_get_path_str(mod, my_path, sizeof my_path)) {
+                log_msg(LOG_LEVEL_ERROR, MODULE_NAME "Cannot register keyboard control for GL!\n");
+        }
+        struct msg_universal *m = (struct msg_universal *) new_message(sizeof(struct msg_universal));
+        sprintf(m->text, "map #%d %s fullscreen#toggle fullscreen", (int) 'f', my_path);
+        struct response *r = send_message_sync(get_root_module(mod), "keycontrol", (struct message *) m, 100,  SEND_MESSAGE_FLAG_QUIET | SEND_MESSAGE_FLAG_NO_STORE);
+        if (response_get_status(r) != RESPONSE_OK) {
+                log_msg(LOG_LEVEL_ERROR, MODULE_NAME "Cannot register keyboard control for GL(error %d)!\n", response_get_status(r));
+        }
+        free_response(r);
+}
+
 REGISTER_MODULE(gl, &display_gl_info, LIBRARY_CLASS_VIDEO_DISPLAY, VIDEO_DISPLAY_ABI_VERSION);