diff --git a/src/shell/atuin.bash b/src/shell/atuin.bash
index 3d86497b..4530e31e 100644
--- a/src/shell/atuin.bash
+++ b/src/shell/atuin.bash
@@ -2,7 +2,7 @@ ATUIN_SESSION=$(atuin uuid)
 export ATUIN_SESSION
 
 _atuin_preexec() {
-    local id; id=$(atuin history start "$1")
+    local id; id=$(atuin history start -- "$1")
     export ATUIN_HISTORY_ID="${id}"
 }
 
@@ -11,13 +11,13 @@ _atuin_precmd() {
 
     [[ -z "${ATUIN_HISTORY_ID}" ]] && return
 
-    (RUST_LOG=error atuin history end "${ATUIN_HISTORY_ID}" --exit "${EXIT}" &) > /dev/null 2>&1
+    (RUST_LOG=error atuin history end --exit "${EXIT}" -- "${ATUIN_HISTORY_ID}" &) > /dev/null 2>&1
 }
 
 __atuin_history ()
 {
     tput rmkx
-    HISTORY="$(RUST_LOG=error atuin search -i "${READLINE_LINE}" 3>&1 1>&2 2>&3)"
+    HISTORY="$(RUST_LOG=error atuin search -i -- "${READLINE_LINE}" 3>&1 1>&2 2>&3)"
     tput smkx
 
     READLINE_LINE=${HISTORY}
diff --git a/src/shell/atuin.fish b/src/shell/atuin.fish
index e2802544..359f7bfa 100644
--- a/src/shell/atuin.fish
+++ b/src/shell/atuin.fish
@@ -1,19 +1,19 @@
 set -gx ATUIN_SESSION (atuin uuid)
 
 function _atuin_preexec --on-event fish_preexec
-    set -gx ATUIN_HISTORY_ID (atuin history start "$argv[1]")
+    set -gx ATUIN_HISTORY_ID (atuin history start -- "$argv[1]")
 end
 
 function _atuin_postexec --on-event fish_postexec
     set s $status
     if test -n "$ATUIN_HISTORY_ID"
-        RUST_LOG=error atuin history end $ATUIN_HISTORY_ID --exit $s &
+        RUST_LOG=error atuin history end --exit $s -- $ATUIN_HISTORY_ID &
         disown
     end
 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
diff --git a/src/shell/atuin.zsh b/src/shell/atuin.zsh
index e35e16e0..4e6b76d9 100644
--- a/src/shell/atuin.zsh
+++ b/src/shell/atuin.zsh
@@ -13,7 +13,7 @@ export ATUIN_SESSION=$(atuin uuid)
 export ATUIN_HISTORY="atuin history list"
 
 _atuin_preexec(){
-	local id; id=$(atuin history start "$1")
+	local id; id=$(atuin history start -- "$1")
 	export ATUIN_HISTORY_ID="$id"
 }
 
@@ -23,7 +23,7 @@ _atuin_precmd(){
 	[[ -z "${ATUIN_HISTORY_ID}" ]] && return
 
 
-	(RUST_LOG=error atuin history end $ATUIN_HISTORY_ID --exit $EXIT &) > /dev/null 2>&1
+	(RUST_LOG=error atuin history end --exit $EXIT -- $ATUIN_HISTORY_ID &) > /dev/null 2>&1
 }
 
 _atuin_search(){
@@ -34,7 +34,7 @@ _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)
+	output=$(RUST_LOG=error atuin search -i -- $BUFFER 3>&1 1>&2 2>&3)
 	echoti smkx
 
 	if [[ -n $output ]] ; then