diff --git a/data/widgets/debugger.xml b/data/widgets/debugger.xml
index 5514338b0..d365d3dfb 100644
--- a/data/widgets/debugger.xml
+++ b/data/widgets/debugger.xml
@@ -14,7 +14,7 @@
         <item icon="debug_breakpoint" tooltip="@.toggle_breakpoint" tooltip_dir="bottom" />
       </buttonset>
     </hbox>
-    <splitter horizontal="true" noborders="true" childspacing="2" expansive="true">
+    <splitter id="main_area" horizontal="true" noborders="true" childspacing="2" expansive="true">
       <view id="source_placeholder" />
       <splitter vertical="true" noborders="true" childspacing="2" expansive="true">
         <vbox id="stack_part">
diff --git a/src/app/commands/debugger.cpp b/src/app/commands/debugger.cpp
index 96fe2760e..e50f9ed53 100644
--- a/src/app/commands/debugger.cpp
+++ b/src/app/commands/debugger.cpp
@@ -402,6 +402,8 @@ public:
       onEvalExpression(expr);
     });
 
+    mainArea()->setVisible(false);
+
     sourcePlaceholder()->attachToView(&m_sourceViewer);
     sourcePlaceholder()->setVisible(false);
 
@@ -618,6 +620,7 @@ public:
     updateControls();
 
     if (m_state == State::WaitingNextCommand) {
+      mainArea()->setVisible(true);
       sourcePlaceholder()->setVisible(true);
       stackPlaceholder()->setVisible(true);
       layout();