diff --git a/modules/editor/evil/init.el b/modules/editor/evil/init.el
index f9b1f2924..0c0a89b76 100644
--- a/modules/editor/evil/init.el
+++ b/modules/editor/evil/init.el
@@ -359,4 +359,13 @@ and complains if a module is loaded too early (during startup)."
     (dolist (mode evil-collection-mode-list)
       (dolist (req (or (cdr-safe mode) (list mode)))
         (with-eval-after-load req
-          (+evil-collection-init mode +evil-collection-disabled-list))))))
+          (+evil-collection-init mode +evil-collection-disabled-list)))))
+
+  ;; HACK: The Diff options in `save-some-buffers's prompt should persist after
+  ;;   you quit view-mode, but evil-collection-view's bindings on q/Q break
+  ;;   this, so these are here to restore them.
+  ;; REVIEW: PR this upstream!
+  (map! :after (view evil-collection-view)
+        :map view-mode-map
+        :n "q" #'View-quit
+        :n "Q" #'View-quit-all))