diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 43198fbb..8a7b35ad 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -151,7 +151,7 @@
                                                    pcomplete-extension pcmpl-args pcmpl-git))
 (nconc package-selected-packages '(esh-autosuggest))
 (with-eval-after-load 'eshell (require 'init-eshell))
-(autoload 'ambrevar/eshell-or-new-session "eshell")
+(autoload 'helm-eshell-switch "eshell")
 
 ;;; Eww
 (with-eval-after-load 'eww (require 'init-eww))
diff --git a/.emacs.d/lisp/init-exwm.el b/.emacs.d/lisp/init-exwm.el
index 90c99a6e..e5f790f5 100644
--- a/.emacs.d/lisp/init-exwm.el
+++ b/.emacs.d/lisp/init-exwm.el
@@ -81,7 +81,7 @@
 ;;; Emacs mode shortcuts.
 (exwm-input-set-key (kbd "s-t") #'ambrevar/org-switch-agenda-file)
 (exwm-input-set-key (kbd "s-T") #'ambrevar/org-switch-agenda-file-other-window)
-(exwm-input-set-key (kbd "s-<return>") #'ambrevar/eshell-or-new-session)
+(exwm-input-set-key (kbd "s-<return>") #'helm-eshell-switch)
 (with-eval-after-load 'slime
   (exwm-input-set-key (kbd "s-<backspace>") #'ambrevar/slime-switch-to-repl))
 (when (fboundp 'magit-status)