diff --git a/atuin/src/shell/atuin.bash b/atuin/src/shell/atuin.bash
index a0b2006..3c15d39 100644
--- a/atuin/src/shell/atuin.bash
+++ b/atuin/src/shell/atuin.bash
@@ -29,6 +29,8 @@ __atuin_history() {
       eval "$HISTORY"
       _atuin_precmd
       echo
+      READLINE_LINE=""
+      READLINE_POINT=${#READLINE_LINE}
     else
       READLINE_LINE=${HISTORY}
       READLINE_POINT=${#READLINE_LINE}
diff --git a/atuin/src/shell/atuin.fish b/atuin/src/shell/atuin.fish
index 9f02579..182a29b 100644
--- a/atuin/src/shell/atuin.fish
+++ b/atuin/src/shell/atuin.fish
@@ -31,6 +31,7 @@ function _atuin_search
           # Allow space for repainting the prompt, this will work for prompts up to 2 lines
           echo
           echo
+          commandline -r ""
         else
           commandline -r "$h"
         end