diff --git a/app/src/electron.js b/app/src/electron.js
index d794fe672..4566c30ec 100644
--- a/app/src/electron.js
+++ b/app/src/electron.js
@@ -183,6 +183,9 @@ function createWindow() {
   if (initialConfig['winIsMaximized']) {
     mainWindow.maximize();
   }
+  if (initialConfig['winIsFullscreen']) {
+    mainWindow.setFullScreen(true);
+  }
 
   mainMenu = buildMenu();
   mainWindow.setMenu(mainMenu);
@@ -203,6 +206,7 @@ function createWindow() {
             winBounds: mainWindow.getBounds(),
             winIsMaximized: mainWindow.isMaximized(),
             useNativeMenu: useNativeMenuSpecified,
+            winIsFullscreen: mainWindow.isFullScreen(),
           }),
           'utf-8'
         );
diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts
index 2935d6642..0c06dc3f0 100644
--- a/packages/web/src/commands/stdCommands.ts
+++ b/packages/web/src/commands/stdCommands.ts
@@ -594,6 +594,7 @@ registerCommand({
   id: 'app.toggleFullScreen',
   category: 'Application',
   name: 'Toggle full screen',
+  keyText: 'F11',
   testEnabled: () => getElectron() != null,
   onClick: () => getElectron().send('window-action', 'fullscreen'),
 });
@@ -642,7 +643,6 @@ registerCommand({
   onClick: () => openWebLink('https://opencollective.com/dbgate'),
 });
 
-
 registerCommand({
   id: 'app.zoomIn',
   category: 'Application',