diff --git a/modules/tools/pdf/config.el b/modules/tools/pdf/config.el
index 6e5c09ff3..55eb60b70 100644
--- a/modules/tools/pdf/config.el
+++ b/modules/tools/pdf/config.el
@@ -1,10 +1,14 @@
 ;;; tools/pdf/config.el -*- lexical-binding: t; -*-
 
 (def-package! pdf-tools
-  :defer t
-  :init (load "pdf-tools-autoloads.el" nil t t)
+  :mode ("\\.pdf$" . pdf-view-mode)
+  :init (load "pdf-tools-autoloads" nil t)
   :config
-  (pdf-tools-install)
+  (unless noninteractive
+    (pdf-tools-install))
+
+  (map! :map pdf-view-mode-map "q" #'kill-this-buffer)
+
   (setq-default pdf-view-display-size 'fit-page)
   ;; turn off cua so copy works
   (add-hook! 'pdf-view-mode-hook (cua-mode 0)))