diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index 769d63c72289864334c3652443ce314ebbbd33bd..711a3ae2bc759d921bafeb97719b2e1bb59155f1 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -490,9 +490,11 @@ void DebuggerManager::setSimpleDockWidgetArrangement()
     m_mainWindow->tabifyDockWidget(m_watchDock, m_outputDock);
     m_mainWindow->tabifyDockWidget(m_watchDock, m_registerDock);
     m_mainWindow->tabifyDockWidget(m_watchDock, m_threadsDock);
+    m_mainWindow->tabifyDockWidget(m_watchDock, m_sourceFilesDock);
 
     // They are rarely used even in ordinary debugging. Hiding them also saves
     // cycles since the corresponding information won't be retrieved.
+    m_sourceFilesDock->hide();
     m_registerDock->hide();
     m_disassemblerDock->hide();
     m_modulesDock->hide();
@@ -515,6 +517,7 @@ void DebuggerManager::setLocked(bool locked)
         }
         dockWidget->setTitleBarWidget(titleBarWidget);
         dockWidget->setFeatures(features);
+        dockWidget->toggleViewAction()->setEnabled(true);
     }
 }
 
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index d3e61c79c29aea470ebf95656604d9912c815a9d..c313b0592e7ad4f35eceb73c4426bf6b9b83d1a6 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -453,7 +453,7 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *error_mes
 #endif
 
     cmd = am->registerAction(m_manager->m_continueAction,
-        ProjectExplorer::Constants::DEBUG, QList<int>()<< m_gdbRunningContext);
+        ProjectExplorer::Constants::DEBUG, QList<int>() << m_gdbRunningContext);
 
     cmd = am->registerAction(m_manager->m_stopAction,
         Constants::INTERRUPT, globalcontext);