diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 676af995318a68e968573d03c78d55e4d92d2ac8..90c8faaadf1006fd605bbd336ed9aac7d12bb3da 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -503,17 +503,17 @@
     }
   },
   {
-    "context": "Editor && inline_completion",
+    "context": "Editor && inline_completion && !showing_completions",
+    "use_key_equivalents": true,
     "bindings": {
-      // Changing the modifier currently breaks accepting while you also an LSP completions menu open
-      "alt-enter": "editor::AcceptInlineCompletion"
+      "tab": "editor::AcceptInlineCompletion"
     }
   },
   {
-    "context": "Editor && inline_completion && !showing_completions",
-    "use_key_equivalents": true,
+    "context": "Editor && inline_completion && showing_completions",
     "bindings": {
-      "tab": "editor::AcceptInlineCompletion"
+      // Currently, changing this binding breaks the preview behavior
+      "alt-enter": "editor::AcceptInlineCompletion"
     }
   },
   {
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index e865bc14ad44caddd559cd8b2778e329520e3a9a..934373b675727104875fa6ddaeb67ff98e053d21 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -580,17 +580,17 @@
     }
   },
   {
-    "context": "Editor && inline_completion",
+    "context": "Editor && inline_completion && !showing_completions",
+    "use_key_equivalents": true,
     "bindings": {
-      // Changing the modifier currently breaks accepting while you also an LSP completions menu open
-      "alt-tab": "editor::AcceptInlineCompletion"
+      "tab": "editor::AcceptInlineCompletion"
     }
   },
   {
-    "context": "Editor && inline_completion && !showing_completions",
-    "use_key_equivalents": true,
+    "context": "Editor && inline_completion && showing_completions",
     "bindings": {
-      "tab": "editor::AcceptInlineCompletion"
+      // Currently, changing this binding breaks the preview behavior
+      "alt-tab": "editor::AcceptInlineCompletion"
     }
   },
   {