diff --git a/src/xpra/client/gtk_base/gtk_client_window_base.py b/src/xpra/client/gtk_base/gtk_client_window_base.py
index 6c3dee437f..b8aad25f11 100644
--- a/src/xpra/client/gtk_base/gtk_client_window_base.py
+++ b/src/xpra/client/gtk_base/gtk_client_window_base.py
@@ -908,6 +908,13 @@ def toggle_pointer_grab(self):
         else:
             self.pointer_grab()
 
+    def toggle_fullscreen(self):
+        geomlog("toggle_fullscreen()")
+        if self._fullscreen:
+            self.unfullscreen()
+        else:
+            self.fullscreen()
+
 
     def set_menu(self, menu):
         menulog("set_menu(%s)", menu)
diff --git a/src/xpra/scripts/config.py b/src/xpra/scripts/config.py
index 0028724861..1952bd70bc 100755
--- a/src/xpra/scripts/config.py
+++ b/src/xpra/scripts/config.py
@@ -669,6 +669,7 @@ def get_default_key_shortcuts():
     return [shortcut for e,shortcut in [
                (True,   "Control+Menu:toggle_keyboard_grab"),
                (True,   "Shift+Menu:toggle_pointer_grab"),
+               (True,   "Shift+F11:toggle_fullscreen"),
                (True,   "Meta+Shift+F1:show_menu"),
                (True,   "Meta+Shift+F2:show_start_new_command"),
                (True,   "Meta+Shift+F3:show_bug_report"),