diff --git a/lib/completion.zsh b/lib/completion.zsh
index 47a4ed60f..2b62785d5 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -65,7 +65,10 @@ if [[ $COMPLETION_WAITING_DOTS = true ]]; then
     zle redisplay
   }
   zle -N expand-or-complete-with-dots
-  bindkey "^I" expand-or-complete-with-dots
+  # Set the function as the default tab completion widget
+  bindkey -M emacs "^I" expand-or-complete-with-dots
+  bindkey -M viins "^I" expand-or-complete-with-dots
+  bindkey -M vicmd "^I" expand-or-complete-with-dots
 fi
 
 # automatically load bash completion functions