diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 6c2a37abd7d..cf1e7e41ba1 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1132,6 +1132,7 @@ POS can be a buffer position or a button"
                       mouse-face highlight
                       help-echo "mouse-2: visit this diagnostic"
                       face nil
+                      keymap flymake-diagnostics-buffer-mode-map
                       mouse-action flymake-goto-diagnostic)]))))
 
 (define-derived-mode flymake-diagnostics-buffer-mode tabulated-list-mode