diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index f62f9f5ce3c..823aa4fe673 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -2428,7 +2428,10 @@ symbol `fringes' or the symbol `margins'."
            `((margin ,flymake-margin-indicator-position)
              ,(propertize
                indicator-car
-               'face `(:inherit (,(cdr valuelist) default))
+               'face `(:inherit (,(cdr valuelist)
+                                 ,(if (facep 'margin)
+                                      'margin
+                                    'default)))
                'mouse-face 'highlight
                'help-echo "Open Flymake diagnostics"
                'keymap (let ((map (make-sparse-keymap)))