diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 4321cc11b..2204e3ac4 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -906,9 +906,7 @@ func (gui *Gui) fetch(g *gocui.Gui, v *gocui.View, canAskForCredentials bool) (u
 		_ = gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("Error"), coloredMessage, close, close)
 	}
 
-	if err := gui.refreshStatus(g); err != nil {
-		return unamePassOpend, err
-	}
+	_ = gui.refreshStatus(g)
 
 	return unamePassOpend, err
 }
diff --git a/pkg/gui/stash_panel.go b/pkg/gui/stash_panel.go
index 8a8994fdb..62d138fb4 100644
--- a/pkg/gui/stash_panel.go
+++ b/pkg/gui/stash_panel.go
@@ -98,7 +98,7 @@ func (gui *Gui) stashDo(g *gocui.Gui, v *gocui.View, method string) error {
 		return gui.createErrorPanel(g, err.Error())
 	}
 	if err := gui.refreshStashEntries(g); err != nil {
-		return err
+		return gui.createErrorPanel(g, err.Error())
 	}
 	return gui.refreshFiles()
 }
@@ -112,7 +112,7 @@ func (gui *Gui) handleStashSave(stashFunc func(message string) error) error {
 			return gui.createErrorPanel(g, err.Error())
 		}
 		if err := gui.refreshStashEntries(g); err != nil {
-			return err
+			return gui.createErrorPanel(g, err.Error())
 		}
 		return gui.refreshFiles()
 	})