diff --git a/pkg/gui/background.go b/pkg/gui/background.go
index 1be8d2e21..8142c9af9 100644
--- a/pkg/gui/background.go
+++ b/pkg/gui/background.go
@@ -76,9 +76,9 @@ func (self *BackgroundRoutineMgr) startBackgroundFetch() {
 	self.gui.waitForIntro.Wait()
 
 	fetch := func() error {
-		return self.gui.PopupHandler.WithWaitingStatusSync(self.gui.Tr.FetchingStatus, func() error {
+		return self.gui.helpers.AppStatus.WithWaitingStatusImpl(self.gui.Tr.FetchingStatus, func(gocui.Task) error {
 			return self.backgroundFetch()
-		})
+		}, nil)
 	}
 
 	// We want an immediate fetch at startup, and since goEvery starts by
diff --git a/pkg/gui/controllers/helpers/app_status_helper.go b/pkg/gui/controllers/helpers/app_status_helper.go
index cf94c58cd..937518632 100644
--- a/pkg/gui/controllers/helpers/app_status_helper.go
+++ b/pkg/gui/controllers/helpers/app_status_helper.go
@@ -60,9 +60,13 @@ func (self appStatusHelperTask) Continue() {
 // withWaitingStatus wraps a function and shows a waiting status while the function is still executing
 func (self *AppStatusHelper) WithWaitingStatus(message string, f func(gocui.Task) error) {
 	self.c.OnWorker(func(task gocui.Task) error {
-		return self.statusMgr().WithWaitingStatus(message, self.renderAppStatus, func(waitingStatusHandle *status.WaitingStatusHandle) error {
-			return f(appStatusHelperTask{task, waitingStatusHandle})
-		})
+		return self.WithWaitingStatusImpl(message, f, task)
+	})
+}
+
+func (self *AppStatusHelper) WithWaitingStatusImpl(message string, f func(gocui.Task) error, task gocui.Task) error {
+	return self.statusMgr().WithWaitingStatus(message, self.renderAppStatus, func(waitingStatusHandle *status.WaitingStatusHandle) error {
+		return f(appStatusHelperTask{task, waitingStatusHandle})
 	})
 }