diff --git a/.emacs.d/lisp/init-exwm.el b/.emacs.d/lisp/init-exwm.el
index e9973eed..5e240a83 100644
--- a/.emacs.d/lisp/init-exwm.el
+++ b/.emacs.d/lisp/init-exwm.el
@@ -38,8 +38,12 @@
 (exwm-input-set-key (kbd "s-k") #'windmove-up)
 (exwm-input-set-key (kbd "s-l") #'windmove-right)
 (exwm-input-set-key (kbd "s-D") #'kill-this-buffer)
-(exwm-input-set-key (kbd "s-b") #'list-buffers)
-(exwm-input-set-key (kbd "s-f") #'find-file)
+;; WARNING: helm-mini and helm-find-files sometimes display nothing when bound
+;; with `exwm-input-set-key'.  See below.
+(define-key exwm-mode-map (kbd "s-b") #'list-buffers)
+(global-set-key (kbd "s-b") #'list-buffers)
+(define-key exwm-mode-map (kbd "s-f") #'find-file)
+(global-set-key (kbd "s-f") #'find-file)
 
 (when (require 'windower nil 'noerror)
   (exwm-input-set-key (kbd "s-<tab>") 'windower-switch-to-last-buffer)
@@ -62,8 +66,13 @@
   (ambrevar/define-keys helm-map
                         "s-\\" 'helm-toggle-resplit-and-swap-windows)
   (exwm-input-set-key (kbd "s-c") #'helm-resume)
-  (exwm-input-set-key (kbd "s-b") #'helm-mini)
-  (exwm-input-set-key (kbd "s-f") #'helm-find-files)
+  ;; WARNING: helm-mini and helm-find-files sometimes display nothing when bound
+  ;; with `exwm-input-set-key'.
+  (define-key exwm-mode-map (kbd "s-b") #'helm-mini)
+  (global-set-key (kbd "s-b") #'helm-mini)
+  (define-key exwm-mode-map (kbd "s-f") #'helm-find-files)
+  (global-set-key (kbd "s-f") #'helm-find-files)
+  ;; (push `(,(kbd "s-f") . helm-find-files) exwm-input-global-keys)
   (exwm-input-set-key (kbd "s-F") #'helm-locate)
   (when (fboundp 'ambrevar/helm-locate-meta)
     (exwm-input-set-key (kbd "s-F") #'ambrevar/helm-locate-meta))