diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index f93c459ec6985e884856dff6ce924a1559f81eb0..5c300e82883160b1b0e0878190eb2ddef4eb2a6f 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -468,21 +468,24 @@
     }
   },
   {
-    "context": "Editor && showing_completions",
+    "context": "Editor && !inline_completion && showing_completions",
     "use_key_equivalents": true,
     "bindings": {
-      "enter": "editor::ConfirmCompletion"
+      "enter": "editor::ConfirmCompletion",
+      "tab": "editor::ComposeCompletion"
     }
   },
   {
-    "context": "Editor && !inline_completion && showing_completions",
+    "context": "Editor && inline_completion && showing_completions",
     "use_key_equivalents": true,
     "bindings": {
-      "tab": "editor::ComposeCompletion"
+      "enter": "editor::ConfirmCompletion",
+      "tab": "editor::ComposeCompletion",
+      "shift-tab": "editor::AcceptInlineCompletion"
     }
   },
   {
-    "context": "Editor && inline_completion",
+    "context": "Editor && inline_completion && !showing_completions",
     "use_key_equivalents": true,
     "bindings": {
       "tab": "editor::AcceptInlineCompletion"
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index f821bc982d3ac04df1f78c9b907f5f6d0d972179..a3f35dccdd4e78923df5c0554ac0777d459e58e8 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -539,21 +539,24 @@
     }
   },
   {
-    "context": "Editor && showing_completions",
+    "context": "Editor && !inline_completion && showing_completions",
     "use_key_equivalents": true,
     "bindings": {
-      "enter": "editor::ConfirmCompletion"
+      "enter": "editor::ConfirmCompletion",
+      "tab": "editor::ComposeCompletion"
     }
   },
   {
-    "context": "Editor && !inline_completion && showing_completions",
+    "context": "Editor && inline_completion && showing_completions",
     "use_key_equivalents": true,
     "bindings": {
-      "tab": "editor::ComposeCompletion"
+      "enter": "editor::ConfirmCompletion",
+      "tab": "editor::ComposeCompletion",
+      "shift-tab": "editor::AcceptInlineCompletion"
     }
   },
   {
-    "context": "Editor && inline_completion",
+    "context": "Editor && inline_completion && !showing_completions",
     "use_key_equivalents": true,
     "bindings": {
       "tab": "editor::AcceptInlineCompletion"