diff --git a/README.org b/README.org
index edb7054..a12c93f 100644
--- a/README.org
+++ b/README.org
@@ -321,6 +321,7 @@ Expands into a call to ~org-ql-select~ with the same arguments.  For convenience
 
 *Fixed*
 +  Handle date ranges in date-based selectors.  (Thanks to [[https://github.com/codygman][Cody Goodman]], [[https://github.com/swflint][Samuel W. Flint]], and [[https://github.com/vikasrawal][Vikas Rawal]].)
++  Don't overwrite bindings in =org-agenda-mode-map=.
 
 *Compatibility*
 +  Fixes for compatibility with Org 9.2.  (Thanks to [[https://github.com/ataias][Ataias Pereira Reis]] and [[https://github.com/dakra][Daniel Kraus]].)
diff --git a/org-ql-agenda.el b/org-ql-agenda.el
index 79dda2e..1bdcb6e 100644
--- a/org-ql-agenda.el
+++ b/org-ql-agenda.el
@@ -222,8 +222,11 @@ SORT: One or a list of `org-ql' sorting functions, like `date' or
                    (string (org-ql-agenda--buffer buffer))
                    (null (org-ql-agenda--buffer buffer))
                    (buffer buffer)))
+         (map (copy-keymap org-agenda-mode-map))
          (inhibit-read-only t))
+    (define-key map "g" #'org-ql-search-refresh)
     (with-current-buffer buffer
+      (use-local-map map)
       ;; Prepare buffer, saving data for refreshing.
       (setq-local org-ql-buffers-files buffers-files)
       (setq-local org-ql-query query)
@@ -231,8 +234,6 @@ SORT: One or a list of `org-ql' sorting functions, like `date' or
       (setq-local org-ql-narrow narrow)
       (setq-local org-ql-super-groups super-groups)
       (setq-local header-line-format (org-ql-agenda--header-line-format buffers-files query))
-      ;; TODO: Derive a minor mode and set keymap there.
-      (local-set-key "g" #'org-ql-search-refresh)
       ;; Clear buffer, insert entries, etc.
       (erase-buffer)
       (insert entries)