diff --git a/dot_config/zsh/init/atuin.zsh b/dot_config/zsh/init/atuin.zsh
index 39b57b5db277bd5f8399255b8a0b018dcd4ac967..383d7a177e98eb47d44c4016c24cad913593cdc9 100644
--- a/dot_config/zsh/init/atuin.zsh
+++ b/dot_config/zsh/init/atuin.zsh
@@ -46,16 +46,9 @@ _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
 
 bindkey '^r' _atuin_search_widget
-bindkey '^[[A' _atuin_up_search_widget
-bindkey '^[OA' _atuin_up_search_widget
diff --git a/dot_config/zsh/private_dot_zshrc.tmpl b/dot_config/zsh/private_dot_zshrc.tmpl
index 67c6daa1b12e26362fbff1f0c7ad5e9c5589dd08..d028476811472c1a63316910b3defd32f6e4b3b5 100644
--- a/dot_config/zsh/private_dot_zshrc.tmpl
+++ b/dot_config/zsh/private_dot_zshrc.tmpl
@@ -207,8 +207,6 @@ function noti() {
 function zathura() { devour zathura "$1" }
 function inkscape() { devour inkscape "$1" }
 
-source "$XDG_CONFIG_HOME/zsh/funcs/transfer.sh"
-
 # Necessary for SSH & YubiKey
 export GPG_TTY="$TTY"
 export SSH_AUTH_SOCK="/run/user/1000/gnupg/S.gpg-agent.ssh"
@@ -234,6 +232,9 @@ export HISTFILE="$XDG_STATE_HOME"/zsh/history
 export HISTSIZE=1000000
 export SAVEHIST=1000000
 
+bindkey '^[[A' history-substring-search-up
+bindkey '^[[B' history-substring-search-down
+
 autoload -Uz compinit && compinit
 autoload -U +X bashcompinit && bashcompinit