diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp
index 28f8bf07da1..8c8d58f3a42 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.cpp
+++ b/src/plugins/projectexplorer/compileoutputwindow.cpp
@@ -43,6 +43,8 @@
 #include <find/basetextfind.h>
 #include <aggregation/aggregate.h>
 #include <extensionsystem/pluginmanager.h>
+#include <texteditor/texteditorsettings.h>
+#include <texteditor/fontsettings.h>
 
 #include <QKeyEvent>
 #include <QIcon>
@@ -66,9 +68,13 @@ namespace Internal {
 
 class CompileOutputTextEdit : public Core::OutputWindow
 {
+    Q_OBJECT
 public:
     CompileOutputTextEdit(const Core::Context &context) : Core::OutputWindow(context)
     {
+        fontSettingsChanged();
+        connect(TextEditor::TextEditorSettings::instance(), SIGNAL(fontSettingsChanged(TextEditor::FontSettings)),
+                this, SLOT(fontSettingsChanged()));
     }
 
     void addTask(const Task &task, int blocknumber)
@@ -80,6 +86,11 @@ public:
     {
         m_taskids.clear();
     }
+private slots:
+    void fontSettingsChanged()
+    {
+        setFont(TextEditor::TextEditorSettings::instance()->fontSettings().font());
+    }
 
 protected:
      void mouseDoubleClickEvent(QMouseEvent *ev)
@@ -260,3 +271,5 @@ void CompileOutputWindow::showPositionOf(const Task &task)
     newCursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
     m_outputWindow->setTextCursor(newCursor);
 }
+
+#include "compileoutputwindow.moc"