diff --git a/pkg/gui/controllers/helpers/app_status_helper.go b/pkg/gui/controllers/helpers/app_status_helper.go
index d0bb03395..99664445c 100644
--- a/pkg/gui/controllers/helpers/app_status_helper.go
+++ b/pkg/gui/controllers/helpers/app_status_helper.go
@@ -97,7 +97,7 @@ func (self *AppStatusHelper) WithWaitingStatusBlockingInput(message string, f fu
 	// Hide the rebasing-mode indicator (and its reset button) while we drive the
 	// rebase ourselves; it reflects the transient on-disk state and would
 	// otherwise flash on for the duration of the operation.
-	self.modeHelper.SetSuppressRebasingMode(true)
+	self.modeHelper.SetSuppressWorkingTreeStateMode(true)
 	self.c.OnWorker(func(task gocui.Task) error {
 		// End the block and restore the mode indicator once the operation and its
 		// refresh have applied their UI updates: OnUIThread queues this after the
@@ -105,7 +105,7 @@ func (self *AppStatusHelper) WithWaitingStatusBlockingInput(message string, f fu
 		// enqueued by the time f returns), so the replayed keys act on the
 		// refreshed state and any resulting rebase state shows correctly.
 		defer self.c.OnUIThread(func() error {
-			self.modeHelper.SetSuppressRebasingMode(false)
+			self.modeHelper.SetSuppressWorkingTreeStateMode(false)
 			return self.c.GocuiGui().EndBlockingEvents()
 		})
 		return self.WithWaitingStatusImpl(message, f, task)
diff --git a/pkg/gui/controllers/helpers/mode_helper.go b/pkg/gui/controllers/helpers/mode_helper.go
index 4947e42d1..50f35341b 100644
--- a/pkg/gui/controllers/helpers/mode_helper.go
+++ b/pkg/gui/controllers/helpers/mode_helper.go
@@ -12,12 +12,12 @@ import (
 type ModeHelper struct {
 	c *HelperCommon
 
-	diffHelper           *DiffHelper
-	patchBuildingHelper  *PatchBuildingHelper
-	cherryPickHelper     *CherryPickHelper
-	mergeAndRebaseHelper *MergeAndRebaseHelper
-	bisectHelper         *BisectHelper
-	suppressRebasingMode bool
+	diffHelper                   *DiffHelper
+	patchBuildingHelper          *PatchBuildingHelper
+	cherryPickHelper             *CherryPickHelper
+	mergeAndRebaseHelper         *MergeAndRebaseHelper
+	bisectHelper                 *BisectHelper
+	suppressWorkingTreeStateMode bool
 }
 
 func NewModeHelper(
@@ -130,7 +130,7 @@ func (self *ModeHelper) Statuses() []ModeStatus {
 		},
 		{
 			IsActive: func() bool {
-				return !self.suppressRebasingMode && self.c.Git().Status.WorkingTreeState().Any()
+				return !self.suppressWorkingTreeStateMode && self.c.Git().Status.WorkingTreeState().Any()
 			},
 			InfoLabel: func() string {
 				workingTreeState := self.c.Git().Status.WorkingTreeState()
@@ -219,6 +219,6 @@ func ScopesToRefreshWhenFilteringModeChanges() []types.RefreshableView {
 	}
 }
 
-func (self *ModeHelper) SetSuppressRebasingMode(value bool) {
-	self.suppressRebasingMode = value
+func (self *ModeHelper) SetSuppressWorkingTreeStateMode(value bool) {
+	self.suppressWorkingTreeStateMode = value
 }