diff --git a/.emacs.d/lisp/init-eshell.el b/.emacs.d/lisp/init-eshell.el
index 7197553f..de760737 100644
--- a/.emacs.d/lisp/init-eshell.el
+++ b/.emacs.d/lisp/init-eshell.el
@@ -257,17 +257,16 @@ This should be faster then `seq-uniq'."
 ;; (add-hook 'eshell-mode-hook 'ambrevar/fix-local-epa-file-encrypt-to)
 
 ;;; Spawning
-(require 'patch-helm)
-
-(helm-defswitcher
- "Eshell"
- (lambda (b)
-   (with-current-buffer b
-     (derived-mode-p 'eshell-mode)))
- (lambda (&optional name)
-   (eshell 'new)
-   (when name
-     (rename-buffer (format "*eshell<%s>*" name) 'unique))))
+(when (require 'patch-helm nil 'noerror)
+  (helm-defswitcher
+   "Eshell"
+   (lambda (b)
+     (with-current-buffer b
+       (derived-mode-p 'eshell-mode)))
+   (lambda (&optional name)
+     (eshell 'new)
+     (when name
+       (rename-buffer (format "*eshell<%s>*" name) 'unique)))))
 
 ;;; Auto-suggestion
 (when (require 'esh-autosuggest nil t)
diff --git a/.emacs.d/lisp/init-exwm.el b/.emacs.d/lisp/init-exwm.el
index a1888ac8..ce3f2d79 100644
--- a/.emacs.d/lisp/init-exwm.el
+++ b/.emacs.d/lisp/init-exwm.el
@@ -80,8 +80,10 @@
 ;;; 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>") #'helm-eshell-switch)
-(exwm-input-set-key (kbd "S-s-<return>") #'helm-eshell-switch-other-window)
+(if (not (fboundp 'helm-eshell-switch))
+    (exwm-input-set-key (kbd "s-<return>") #'eshell)
+  (exwm-input-set-key (kbd "s-<return>") #'helm-eshell-switch)
+  (exwm-input-set-key (kbd "S-s-<return>") #'helm-eshell-switch-other-window))
 (with-eval-after-load 'slime
   (exwm-input-set-key (kbd "s-<backspace>") #'ambrevar/slime-switch-to-repl))
 (when (fboundp 'magit-status)