diff --git a/modules/tools/pass/config.el b/modules/tools/pass/config.el
index d6d78baf8..15303d80e 100644
--- a/modules/tools/pass/config.el
+++ b/modules/tools/pass/config.el
@@ -13,25 +13,19 @@
 ;;;###package password-store
 (setq password-store-password-length 12)
 
-;; Fix hard-coded password-store location; respect PASSWORD_STORE_DIR envvar
-(defadvice! +pass--respect-pass-dir-envvar-a (entry)
-  "Return a string with the file content of ENTRY."
-  :override #'auth-source-pass--read-entry
-  (with-temp-buffer
-    (insert-file-contents
-     (expand-file-name (format "%s.gpg" entry) (password-store-dir)))
-    (buffer-substring-no-properties (point-min) (point-max))))
-
+(after! evil-collection-pass
+  ;; FIXME This needs to be upstreamed to evil-collection.
+  (add-to-list 'evil-collection-pass-command-to-label '(pass-update-buffer . "gr")))
 
 (after! pass
-  (set-evil-initial-state! 'pass-mode 'emacs)
+  (set-evil-initial-state! 'pass-mode 'normal)
   (set-popup-rule! "^\\*Password-Store" :side 'left :size 0.25 :quit nil)
-  (define-key! pass-mode-map
-    "j"    #'pass-next-entry
-    "k"    #'pass-prev-entry
-    "d"    #'pass-kill
-    "\C-j" #'pass-next-directory
-    "\C-k" #'pass-prev-directory))
+  (map! :map pass-mode-map
+        :n "j"   #'pass-next-entry
+        :n "k"   #'pass-prev-entry
+        :n "d"   #'pass-kill
+        :n "C-j" #'pass-next-directory
+        :n "C-k" #'pass-prev-directory))
 
 
 ;; Is built into Emacs 26+