3 files changed, 15 insertions, 8 deletions
diff --git a/src/shell/atuin.bash b/src/shell/atuin.bash
index 4530e31e..9c8fa237 100644
--- a/src/shell/atuin.bash
+++ b/src/shell/atuin.bash
@@ -17,7 +17,8 @@ _atuin_precmd() {
 __atuin_history ()
 {
     tput rmkx
-    HISTORY="$(RUST_LOG=error atuin search -i -- "${READLINE_LINE}" 3>&1 1>&2 2>&3)"
+    # shellcheck disable=SC2048,SC2086
+    HISTORY="$(RUST_LOG=error atuin search $* -i -- "${READLINE_LINE}" 3>&1 1>&2 2>&3)"
     tput smkx
 
     READLINE_LINE=${HISTORY}
@@ -34,6 +35,6 @@ fi
 
 if [[ -z ${ATUIN_NOBIND} ]]; then
     bind -x '"\C-r": __atuin_history'
-    bind -x '"\e[A": __atuin_history'
-    bind -x '"\eOA": __atuin_history'
+    bind -x '"\e[A": __atuin_history --shell-up-key-binding'
+    bind -x '"\eOA": __atuin_history --shell-up-key-binding'
 fi
diff --git a/src/shell/atuin.fish b/src/shell/atuin.fish
index 69175ad4..9446907e 100644
--- a/src/shell/atuin.fish
+++ b/src/shell/atuin.fish
@@ -15,7 +15,7 @@ function _atuin_postexec --on-event fish_postexec
 end
 
 function _atuin_search
-    set h (RUST_LOG=error atuin search -i -- (commandline -b) 3>&1 1>&2 2>&3)
+    set h (RUST_LOG=error atuin search $* -i -- (commandline -b) 3>&1 1>&2 2>&3)
     commandline -f repaint
     if test -n "$h"
         commandline -r $h
@@ -33,7 +33,7 @@ function _atuin_bind_up
     set -l lineno (commandline --line)
     switch $lineno
         case 1
-            _atuin_search
+            _atuin_search --shell-up-key-binding
         case '*'
             up-or-search
     end
diff --git a/src/shell/atuin.zsh b/src/shell/atuin.zsh
index ed1c0c16..dd5c1afc 100644
--- a/src/shell/atuin.zsh
+++ b/src/shell/atuin.zsh
@@ -34,7 +34,8 @@ _atuin_search(){
 	echoti rmkx
 	# swap stderr and stdout, so that the tui stuff works
 	# TODO: not this
-	output=$(RUST_LOG=error atuin search -i -- $BUFFER 3>&1 1>&2 2>&3)
+    # shellcheck disable=SC2048
+	output=$(RUST_LOG=error atuin search $* -i -- $BUFFER 3>&1 1>&2 2>&3)
 	echoti smkx
 
 	if [[ -n $output ]] ; then
@@ -45,15 +46,20 @@ _atuin_search(){
 	zle reset-prompt
 }
 
+_atuin_up_search(){
+  _atuin_search --shell-up-key-binding
+}
+
 add-zsh-hook preexec _atuin_preexec
 add-zsh-hook precmd _atuin_precmd
 
 zle -N _atuin_search_widget _atuin_search
+zle -N _atuin_up_search_widget _atuin_up_search
 
 if [[ -z $ATUIN_NOBIND ]]; then
 	bindkey '^r' _atuin_search_widget
 
 	# depends on terminal mode
-	bindkey '^[[A' _atuin_search_widget
-	bindkey '^[OA' _atuin_search_widget
+  bindkey '^[[A' _atuin_up_search_widget
+  bindkey '^[OA' _atuin_up_search_widget
 fi