diff --git a/app/keymaps/linux.json b/app/keymaps/linux.json
index 0adb2a23..d66494f6 100644
--- a/app/keymaps/linux.json
+++ b/app/keymaps/linux.json
@@ -10,7 +10,7 @@
   "window:minimize": "ctrl+shift+m",
   "window:zoom": "ctrl+shift+alt+m",
   "window:toggleFullScreen": "f11",
-  "window:close": "ctrl+shift+w",
+  "window:close": "ctrl+shift+q",
   "tab:new": "ctrl+shift+t",
   "tab:next": "ctrl+tab",
   "tab:prev": "ctrl+shift+tab",
@@ -18,7 +18,7 @@
   "pane:prev": "ctrl+pagedown",
   "pane:splitVertical": "ctrl+shift+d",
   "pane:splitHorizontal": "ctrl+shift+e",
-  "pane:close": "ctrl+alt+w",
+  "pane:close": "ctrl+shift+w",
   "editor:undo": "ctrl+shift+z",
   "editor:redo": "ctrl+shift+y",
   "editor:cut": "ctrl+shift+x",
diff --git a/app/keymaps/win32.json b/app/keymaps/win32.json
index 860b2a5b..ee94f2c5 100644
--- a/app/keymaps/win32.json
+++ b/app/keymaps/win32.json
@@ -10,7 +10,7 @@
   "window:minimize": "ctrl+m",
   "window:zoom": "ctrl+shift+alt+m",
   "window:toggleFullScreen": "f11",
-  "window:close": "ctrl+shift+w",
+  "window:close": "ctrl+shift+q",
   "tab:new": "ctrl+shift+t",
   "tab:next": "ctrl+tab",
   "tab:prev": "ctrl+shift+tab",
@@ -18,7 +18,7 @@
   "pane:prev": "ctrl+pagedown",
   "pane:splitVertical": "ctrl+shift+d",
   "pane:splitHorizontal": "ctrl+shift+e",
-  "pane:close": "ctrl+alt+w",
+  "pane:close": "ctrl+shift+w",
   "editor:undo": "ctrl+shift+z",
   "editor:redo": "ctrl+shift+y",
   "editor:cut": "ctrl+shift+x",