diff --git a/pkg/gui/controllers/helpers/working_tree_helper.go b/pkg/gui/controllers/helpers/working_tree_helper.go
index b7ce2f431..d4a48fa79 100644
--- a/pkg/gui/controllers/helpers/working_tree_helper.go
+++ b/pkg/gui/controllers/helpers/working_tree_helper.go
@@ -274,15 +274,7 @@ func (self *WorkingTreeHelper) WithEnsureCommittableFiles(handler func() error)
 		}
 
 		if self.c.UserConfig().Gui.SkipNoStagedFilesWarning {
-			self.c.LogAction(self.c.Tr.Actions.StageAllFiles)
-			if err := self.c.Git().WorkingTree.StageAll(false); err != nil {
-				return err
-			}
-			self.c.Refresh(types.RefreshOptions{
-				Scope: []types.RefreshableView{types.FILES},
-				Then:  handler,
-			})
-			return nil
+			return self.stageAllAndThen(handler)
 		}
 
 		return self.promptToStageAllAndRetry(handler)
@@ -291,6 +283,18 @@ func (self *WorkingTreeHelper) WithEnsureCommittableFiles(handler func() error)
 	return handler()
 }
 
+func (self *WorkingTreeHelper) stageAllAndThen(then func() error) error {
+	self.c.LogAction(self.c.Tr.Actions.StageAllFiles)
+	if err := self.c.Git().WorkingTree.StageAll(false); err != nil {
+		return err
+	}
+	self.c.Refresh(types.RefreshOptions{
+		Scope: []types.RefreshableView{types.FILES},
+		Then:  then,
+	})
+	return nil
+}
+
 func (self *WorkingTreeHelper) promptToStageAllAndRetry(retry func() error) error {
 	self.c.Confirm(types.ConfirmOpts{
 		Title:  self.c.Tr.NoFilesStagedTitle,