diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go
index 87cff475..ee2360ce 100644
--- a/pkg/gui/view_helpers.go
+++ b/pkg/gui/view_helpers.go
@@ -109,13 +109,9 @@ func (gui *Gui) returnFocus(g *gocui.Gui, v *gocui.View) error {
 	previousView, err := g.View(gui.State.PreviousView)
 	if err != nil {
 		// always fall back to services view if there's no 'previous' view stored
-		previousView, err = g.View("services")
+		previousView, err = g.View(gui.initiallyFocusedViewName())
 		if err != nil {
-			// Or fall back to the containers view if we are not in a docker-compose project
-			previousView, err = g.View("containers")
-			if err != nil {
-				gui.Log.Error(err)
-			}
+			gui.Log.Error(err)
 		}
 	}
 	return gui.switchFocus(g, v, previousView)