diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts
index b01cb687..eb40f61e 100644
--- a/src/main/plugins/menubar.ts
+++ b/src/main/plugins/menubar.ts
@@ -100,8 +100,8 @@ export default class Thumbar {
             submenu: [
                 {
                     label: 'Pause / Play',
-                    accelerator: 'CommandOrControl+Space',
-                    click: () => this._win.webContents.executeJavaScript(`MusicKitInterop.playPause()`)
+                    accelerator: 'Space',
+                    click: () => this._win.webContents.executeJavaScript(`app.SpacePause()`)
                 },
                 {
                     label: 'Next',
diff --git a/src/renderer/index.js b/src/renderer/index.js
index b50e35a7..bd17207e 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -3572,6 +3572,16 @@ const app = new Vue({
         darwinShare(url) {
             ipcRenderer.send('share-menu', url)
         },
+        SpacePause() {       
+            const elems = document.querySelectorAll('input');
+            for (elem of elems){
+                if (elem === document.activeElement) {
+                    return;
+                }
+            }
+            if (!this.isDev) // disable in dev mode to keep my sanity
+            MusicKitInterop.playPause();
+        }
     }
 })