diff --git a/src/plugins/coreplugin/messageoutputwindow.cpp b/src/plugins/coreplugin/messageoutputwindow.cpp
index a88f491955d..da0b2093677 100644
--- a/src/plugins/coreplugin/messageoutputwindow.cpp
+++ b/src/plugins/coreplugin/messageoutputwindow.cpp
@@ -54,7 +54,6 @@ MessageOutputWindow::MessageOutputWindow()
     p.setColor(QPalette::HighlightedText, activeHighlightedText);
     m_widget->setPalette(p);
 
-    setZoomButtonsEnabled(true);
     connect(this, &IOutputPane::zoomIn, m_widget, &Core::OutputWindow::zoomIn);
     connect(this, &IOutputPane::zoomOut, m_widget, &Core::OutputWindow::zoomOut);
     connect(this, &IOutputPane::fontChanged, m_widget, &OutputWindow::setBaseFont);
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index 3122e35bac4..6ed62e141ef 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -98,14 +98,10 @@ IOutputPane::IOutputPane(QObject *parent)
 
     m_zoomInButton->setToolTip(tr("Increase Font Size"));
     m_zoomInButton->setIcon(Utils::Icons::PLUS_TOOLBAR.icon());
-    m_zoomInButton->setAutoRaise(true);
-    m_zoomInButton->setVisible(false);
     connect(m_zoomInButton, &QToolButton::clicked, this, [this] { emit zoomIn(1); });
 
     m_zoomOutButton->setToolTip(tr("Decrease Font Size"));
     m_zoomOutButton->setIcon(Utils::Icons::MINUS.icon());
-    m_zoomOutButton->setAutoRaise(true);
-    m_zoomOutButton->setVisible(false);
     connect(m_zoomOutButton, &QToolButton::clicked, this, [this] { emit zoomOut(1); });
 }
 
@@ -137,9 +133,7 @@ void IOutputPane::setWheelZoomEnabled(bool enabled)
 void IOutputPane::setZoomButtonsEnabled(bool enabled)
 {
     m_zoomInButton->setEnabled(enabled);
-    m_zoomInButton->setVisible(true);
     m_zoomOutButton->setEnabled(enabled);
-    m_zoomOutButton->setVisible(true);
 }
 
 namespace Internal {
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index 672cf72e17a..f622f17e418 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -282,6 +282,8 @@ AppOutputPane::AppOutputPane() :
 
     connect(SessionManager::instance(), &SessionManager::aboutToUnloadSession,
             this, &AppOutputPane::aboutToUnloadSession);
+
+    setZoomButtonsEnabled(false);
 }
 
 AppOutputPane::~AppOutputPane()
diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp
index 022a436d934..24f3c348df3 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.cpp
+++ b/src/plugins/projectexplorer/compileoutputwindow.cpp
@@ -170,7 +170,6 @@ CompileOutputWindow::CompileOutputWindow(QAction *cancelBuildAction) :
                     TextEditor::TextEditorSettings::behaviorSettings().m_scrollWheelZooming);
     };
 
-    setZoomButtonsEnabled(true);
     updateFontSettings();
     updateZoomEnabled();
 
diff --git a/src/plugins/vcsbase/vcsoutputwindow.cpp b/src/plugins/vcsbase/vcsoutputwindow.cpp
index 58609f42c09..69746094ae3 100644
--- a/src/plugins/vcsbase/vcsoutputwindow.cpp
+++ b/src/plugins/vcsbase/vcsoutputwindow.cpp
@@ -300,7 +300,6 @@ VcsOutputWindow::VcsOutputWindow()
                     TextEditor::TextEditorSettings::behaviorSettings().m_scrollWheelZooming);
     };
 
-    setZoomButtonsEnabled(true);
     updateFontSettings();
     updateBehaviorSettings();