diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 33cfb22feed..9a687d2372b 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -278,7 +278,7 @@ void BuildManager::clearBuildQueue()
 
 void BuildManager::toggleOutputWindow()
 {
-    d->m_outputWindow->toggle(IOutputPane::ModeSwitch);
+    d->m_outputWindow->toggle(IOutputPane::ModeSwitch | IOutputPane::WithFocus);
 }
 
 void BuildManager::showTaskWindow()
@@ -288,7 +288,7 @@ void BuildManager::showTaskWindow()
 
 void BuildManager::toggleTaskWindow()
 {
-    d->m_taskWindow->toggle(IOutputPane::ModeSwitch);
+    d->m_taskWindow->toggle(IOutputPane::ModeSwitch | IOutputPane::WithFocus);
 }
 
 bool BuildManager::tasksAvailable()