diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index 31af49521fa..00201293827 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -513,7 +513,8 @@ void OutputPaneManager::shortcutTriggered(int idx)
     // then just give it focus.
     int current = currentIndex();
     if (OutputPanePlaceHolder::isCurrentVisible() && current == idx) {
-        if (!outputPane->hasFocus() && outputPane->canFocus()) {
+        if ((!m_outputWidgetPane->isActiveWindow() || !outputPane->hasFocus())
+            && outputPane->canFocus()) {
             outputPane->setFocus();
             ICore::raiseWindow(m_outputWidgetPane);
         } else {