diff --git a/defaults/keymaps-common.toml b/defaults/keymaps-common.toml
index ff4a53ae..483acc7b 100644
--- a/defaults/keymaps-common.toml
+++ b/defaults/keymaps-common.toml
@@ -115,6 +115,11 @@ key = "ctrl+m"
 command = "list.select"
 when = "list_focus"
 
+[[keymaps]]
+key = "tab"
+command = "list.select"
+when = "completion_focus"
+
 [[keymaps]]
 key = "enter"
 command = "list.select"
@@ -220,7 +225,7 @@ mode = "i"
 [[keymaps]]
 key = "tab"
 command = "insert_tab"
-when = "!in_snippet"
+when = "!in_snippet && !completion_focus"
 mode = "i"
 
 [[keymaps]]