diff --git a/src/main.ts b/src/main.ts
index 70290211d..2a1710afc 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -57,7 +57,7 @@ else {
         }
         mainWindow = createWindow();
 
-        Menu.setApplicationMenu(buildMenuBar(mainWindow))
+        Menu.setApplicationMenu(buildMenuBar())
 
         configureGlobalShortcuts(mainWindow);
 
diff --git a/src/utils/menuUtil.ts b/src/utils/menuUtil.ts
index 47e9e0e3e..846f625b3 100644
--- a/src/utils/menuUtil.ts
+++ b/src/utils/menuUtil.ts
@@ -57,49 +57,38 @@ export function buildContextMenu(mainWindow: BrowserWindow, args: any = {}): Men
     return contextMenu;
 }
 
-export function buildMenuBar(mainWindow: BrowserWindow): Menu {
-    const name = app.getName();
-    return Menu.buildFromTemplate([
+export function buildMenuBar(): Menu {
+    const isMac = process.platform === 'darwin'
+
+    const commonMenuItem = [{
+        label: 'faq',
+        click: () => shell.openExternal('https://ente.io/faq/'),
+    },
+    {
+        label: 'support',
+        toolTip: 'ente.io web client ',
+        click: () => shell.openExternal('mailto:contact@ente.io'),
+    },
+    {
+        label: 'quit',
+        accelerator: 'CommandOrControl+Q',
+        click() { setIsAppQuitting(true); app.quit(); }
+    }]
+
+    return isMac ? Menu.buildFromTemplate([
         {
-            label: '  ',
-            accelerator: 'CmdOrCtrl+R',
-            click() {
-                mainWindow.reload();
-            },
+            label: app.name,
+            submenu: [
+                { role: 'about' }
+                , ...commonMenuItem]
         },
-        ...(process.platform === 'darwin' && [{
-            label: name,
-            submenu: Menu.buildFromTemplate([
-                {
-                    label: 'about ' + name,
-                    role: 'about'
-                },
-            ])
-        }]),
-        {
-            label: 'help',
-            submenu: Menu.buildFromTemplate([
-                {
-                    label: 'faq',
-                    click: () => shell.openExternal('https://ente.io/faq/'),
-                },
-                {
-                    label: 'support',
-                    toolTip: 'ente.io web client ',
-                    click: () => shell.openExternal('mailto:contact@ente.io'),
-                },
-            ]),
-        },
-        {
-            label: 'quit',
-            accelerator: 'CommandOrControl+Q',
-            click() { app.quit(); }
-        },
-    ]);
+    ]) : Menu.buildFromTemplate([{
+        label: app.getName(),
+        submenu: commonMenuItem,
+    }]);
 }
 
 export function configureGlobalShortcuts(mainWindow: BrowserWindow): void {
-    globalShortcut.register('CommandOrControl+R', mainWindow.reload)
-    globalShortcut.register('Shift+CommandOrControl+R', mainWindow.webContents.reloadIgnoringCache)
-    globalShortcut.register("Shift+CommandOrControl+I", mainWindow.webContents.openDevTools)
+    globalShortcut.register('CommandOrControl+R', () => { mainWindow.reload() })
+    globalShortcut.register('Shift+CommandOrControl+R', () => { mainWindow.webContents.reloadIgnoringCache() })
 }