diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 9dda53713f5..9404548aa8c 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1371,7 +1371,10 @@ flymake-start
 
 (defvar flymake-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map `[,flymake-fringe-indicator-position mouse-1]
+    (define-key map `[,(pcase flymake-indicator-type
+		         ('fringes flymake-fringe-indicator-position)
+		         ('margins flymake-margin-indicator-position))
+                      mouse-1]
                 #'flymake-show-buffer-diagnostics)
     map)
   "Keymap for `flymake-mode'.")