diff --git a/crates/atuin-ai/src/commands/init.rs b/crates/atuin-ai/src/commands/init.rs
index 77abc4f4086..9188f5c5386 100644
--- a/crates/atuin-ai/src/commands/init.rs
+++ b/crates/atuin-ai/src/commands/init.rs
@@ -176,7 +176,7 @@ function _atuin_ai_question_mark
         else
             commandline -f repaint
         end
-    else
+    else if not contains -- "$fish_key_bindings" fish_vi_key_bindings fish_hybrid_key_bindings
         # Not at empty prompt, just insert the question mark
         commandline -i "?"
     end
diff --git a/crates/atuin/src/shell/atuin.fish b/crates/atuin/src/shell/atuin.fish
index d1333e46012..87e9392361a 100644
--- a/crates/atuin/src/shell/atuin.fish
+++ b/crates/atuin/src/shell/atuin.fish
@@ -67,7 +67,7 @@ end
 function _atuin_search
     set -l keymap_mode
     switch $fish_key_bindings
-        case fish_vi_key_bindings
+        case fish_vi_key_bindings fish_hybrid_key_bindings
             switch $fish_bind_mode
                 case default
                     set keymap_mode vim-normal