diff --git a/modes/eldoc/evil-collection-eldoc.el b/modes/eldoc/evil-collection-eldoc.el
index 0a1cb74..c4caeff 100644
--- a/modes/eldoc/evil-collection-eldoc.el
+++ b/modes/eldoc/evil-collection-eldoc.el
@@ -52,7 +52,9 @@
 (defun evil-collection-eldoc-setup ()
   "Set up `evil' bindings for `eldoc'."
   (evil-collection-define-key 'normal 'evil-collection-eldoc-doc-buffer-mode-map
-    "q" 'quit-window)
+    "q" #'quit-window
+    "ZZ" #'quit-window
+    "ZQ" #'evil-quit)
 
   ;; Enable a separate minor mode so that we can bind keys to it.
   (advice-add 'eldoc-doc-buffer
diff --git a/modes/restclient/evil-collection-restclient.el b/modes/restclient/evil-collection-restclient.el
index 6921a88..980223b 100644
--- a/modes/restclient/evil-collection-restclient.el
+++ b/modes/restclient/evil-collection-restclient.el
@@ -54,7 +54,9 @@
     "[[" 'restclient-jump-prev
     "]]" 'restclient-jump-next)
   (evil-collection-define-key 'normal 'evil-collection-restclient-mode-map
-    "q" 'quit-window)
+    "q" #'quit-window
+    "ZZ" #'quit-window
+    "ZQ" #'evil-quit)
 
   ;; Enable a separate minor mode so that we can bind keys to it.
   (add-hook 'restclient-response-loaded-hook