diff --git a/python/console/console_base.py b/python/console/console_base.py
index edb5bdb4ae3..f41bc40c5e4 100644
--- a/python/console/console_base.py
+++ b/python/console/console_base.py
@@ -40,7 +40,6 @@ class QgsPythonConsoleBase(QgsCodeEditorPython):
         # Set the default font
         font = QFontDatabase.systemFont(QFontDatabase.FixedFont)
         self.setFont(font)
-        self.setMarginsFont(font)
 
         # Margin 0 is used for line numbers (editor and output)
         self.setMarginWidth(0, "00000")
diff --git a/src/gui/qgscodeeditor.cpp b/src/gui/qgscodeeditor.cpp
index 5a628c74bc4..6354246be9a 100644
--- a/src/gui/qgscodeeditor.cpp
+++ b/src/gui/qgscodeeditor.cpp
@@ -174,7 +174,8 @@ void QgsCodeEditor::setMarginVisible( bool margin )
   mMargin = margin;
   if ( margin )
   {
-    QFont marginFont( QStringLiteral( "Courier" ), 10 );
+    QFont marginFont = getMonospaceFont();
+    marginFont.setPointSize( 10 );
     setMarginLineNumbers( 1, true );
     setMarginsFont( marginFont );
     setMarginWidth( 1, QStringLiteral( "00000" ) );