diff --git a/pkg/gui/tasks_adapter.go b/pkg/gui/tasks_adapter.go
index ed8203237..7a67f4447 100644
--- a/pkg/gui/tasks_adapter.go
+++ b/pkg/gui/tasks_adapter.go
@@ -27,11 +27,17 @@ func (gui *Gui) newCmdTask(view *gocui.View, cmd *exec.Cmd, prefix string) error
 	// thumb to shrink and snap back as the rest loads.
 	view.FreezeScrollbarHeight()
 
-	// Snapshot the view width here, on the UI thread, so the task goroutine
-	// doesn't read the view's live dimensions while it streams output.
-	spec := renderSpec{view: view, cmd: cmd, width: view.InnerWidth()}
+	// The command lays its output out to the width of the view (git's diffstat
+	// graph does), and only the layout settles that, so the task is created after
+	// it, as a diff renderer's is. Taking the width there, on the UI thread, also
+	// keeps the task goroutine from reading the view's live dimensions while it
+	// streams output.
+	gui.afterLayout(func() error {
+		spec := renderSpec{view: view, cmd: cmd, width: view.InnerWidth()}
+		return gui.newTaskForRender(spec, prefix, cmdStr, gui.plainRender)
+	})
 
-	return gui.newTaskForRender(spec, prefix, cmdStr, gui.plainRender)
+	return nil
 }
 
 // plainRender runs the command as it is, with its output going straight into
diff --git a/pkg/integration/tests/diff/stat_follows_a_screen_mode_change.go b/pkg/integration/tests/diff/stat_follows_a_screen_mode_change.go
index 62880c5e1..1c44caa62 100644
--- a/pkg/integration/tests/diff/stat_follows_a_screen_mode_change.go
+++ b/pkg/integration/tests/diff/stat_follows_a_screen_mode_change.go
@@ -49,10 +49,7 @@ var StatFollowsAScreenModeChange = NewIntegrationTest(NewIntegrationTestArgs{
 		t.Views().Main().
 			ContainsViewLines(
 				Contains("file1 | 200"),
-				/* EXPECTED:
 				Contains("1 file changed"),
-				ACTUAL: */
-				MatchesRegexp(`^\++$`),
 			)
 	},
 })