diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index 9ccbea0a0cc..cac44faf6fd 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -533,6 +533,9 @@ void OutputPaneManager::initialize()
                                                  outPane->displayName(),
                                                  cmd->action());
         data.button = button;
+        connect(button, &OutputPaneToggleButton::contextMenuRequested, m_instance, [] {
+            m_instance->popupMenu();
+        });
 
         connect(outPane, &IOutputPane::flashButton, button, [button] { button->flash(); });
         connect(outPane,
@@ -562,7 +565,7 @@ void OutputPaneManager::initialize()
         m_instance->m_titleLabel->setText(g_outputPanes[currentIdx].pane->displayName());
     m_instance->m_buttonsWidget->layout()->addWidget(m_instance->m_manageButton);
     connect(m_instance->m_manageButton,
-            &QAbstractButton::clicked,
+            &OutputPaneManageButton::menuRequested,
             m_instance,
             &OutputPaneManager::popupMenu);
 
@@ -1004,6 +1007,10 @@ bool OutputPaneToggleButton::isPaneVisible() const
     return isVisibleTo(parentWidget());
 }
 
+void OutputPaneToggleButton::contextMenuEvent(QContextMenuEvent *)
+{
+    emit contextMenuRequested();
+}
 
 ///////////////////////////////////////////////////////////////////////
 //
@@ -1016,6 +1023,7 @@ OutputPaneManageButton::OutputPaneManageButton()
     setFocusPolicy(Qt::NoFocus);
     setCheckable(true);
     setFixedWidth(StyleHelper::toolbarStyle() == Utils::StyleHelper::ToolbarStyleCompact ? 17 : 21);
+    connect(this, &QToolButton::clicked, this, &OutputPaneManageButton::menuRequested);
 }
 
 void OutputPaneManageButton::paintEvent(QPaintEvent*)
@@ -1037,6 +1045,11 @@ void OutputPaneManageButton::paintEvent(QPaintEvent*)
     s->drawPrimitive(QStyle::PE_IndicatorArrowDown, &arrowOpt, &p, this);
 }
 
+void OutputPaneManageButton::contextMenuEvent(QContextMenuEvent *)
+{
+    emit menuRequested();
+}
+
 BadgeLabel::BadgeLabel()
 {
     m_font = QApplication::font();
diff --git a/src/plugins/coreplugin/outputpanemanager.h b/src/plugins/coreplugin/outputpanemanager.h
index f3e62d026f0..49b161f35fc 100644
--- a/src/plugins/coreplugin/outputpanemanager.h
+++ b/src/plugins/coreplugin/outputpanemanager.h
@@ -108,6 +108,11 @@ class OutputPaneToggleButton : public QToolButton
     void setIconBadgeNumber(int number);
     bool isPaneVisible() const;
 
+    void contextMenuEvent(QContextMenuEvent *e) override;
+
+signals:
+    void contextMenuRequested();
+
 private:
     void updateToolTip();
     void checkStateSet() override;
@@ -124,7 +129,12 @@ class OutputPaneManageButton : public QToolButton
     Q_OBJECT
 public:
     OutputPaneManageButton();
-    void paintEvent(QPaintEvent*) override;
+    void paintEvent(QPaintEvent *) override;
+
+    void contextMenuEvent(QContextMenuEvent *e) override;
+
+signals:
+    void menuRequested();
 };
 
 } // namespace Internal