diff --git a/app/src/electron.js b/app/src/electron.js
index 8977f17bc..f16a21b0f 100644
--- a/app/src/electron.js
+++ b/app/src/electron.js
@@ -186,13 +186,7 @@ ipcMain.on('window-action', async (event, arg) => {
       mainWindow.minimize();
       break;
     case 'maximize':
-      if (mainWindow.isMaximized()) {
-        mainWindow.unmaximize();
-        mainWindow.webContents.send('setIsMaximized', false);
-      } else {
-        mainWindow.maximize();
-        mainWindow.webContents.send('setIsMaximized', true);
-      }
+      mainWindow.isMaximized() ? mainWindow.unmaximize() : mainWindow.maximize();
       break;
     case 'close':
       mainWindow.close();
@@ -332,6 +326,14 @@ function createWindow() {
       mainWindow.setIcon(path.resolve(__dirname, '../icon.png'));
     }
     // mainWindow.webContents.toggleDevTools();
+
+    mainWindow.on('maximize', () => {
+      mainWindow.webContents.send('setIsMaximized', true);
+    });
+
+    mainWindow.on('unmaximize', () => {
+      mainWindow.webContents.send('setIsMaximized', false);
+    });
   }
 
   if (!apiLoaded) {
diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts
index 46f23cb48..58bafc62f 100644
--- a/packages/web/src/commands/stdCommands.ts
+++ b/packages/web/src/commands/stdCommands.ts
@@ -693,6 +693,14 @@ registerCommand({
   onClick: () => getElectron().send('window-action', 'minimize'),
 });
 
+registerCommand({
+  id: 'app.maximize',
+  category: 'Application',
+  name: 'Maximize',
+  testEnabled: () => getElectron() != null,
+  onClick: () => getElectron().send('window-action', 'maximize'),
+});
+
 registerCommand({
   id: 'app.toggleFullScreen',
   category: 'Application',