WIP

1 files changed, 14 insertions, 19 deletions

diff --git a/pkg/gui/arrangement.go b/pkg/gui/arrangement.go
index 25988bbd2..49311b6d4 100644
--- a/pkg/gui/arrangement.go
+++ b/pkg/gui/arrangement.go
@@ -244,27 +244,22 @@ func (gui *Gui) sidePanelChildren(width int, height int) []*boxlayout.Box {
 }
 
 func (gui *Gui) currentCyclableViewName() string {
-	currView := gui.g.CurrentView()
-	currentCyclebleView := gui.State.PreviousView
-	if currView != nil {
-		viewName := currView.Name()
-		usePreviousView := true
-		for _, view := range gui.getCyclableViews() {
-			if view == viewName {
-				currentCyclebleView = viewName
-				usePreviousView = false
-				break
+	// there is always a cyclable context in the context stack. We'll look from top to bottom
+	for idx := range gui.State.ContextStack {
+		reversedIdx := len(gui.State.ContextStack) - 1 - idx
+		context := gui.State.ContextStack[reversedIdx]
+
+		if context.GetKind() == SIDE_CONTEXT {
+			viewName := context.GetViewName()
+
+			// unfortunate result of the fact that these are separate views, have to map explicitly
+			if viewName == "commitFiles" {
+				return "commits"
 			}
-		}
-		if usePreviousView {
-			currentCyclebleView = gui.State.PreviousView
-		}
-	}
 
-	// unfortunate result of the fact that these are separate views, have to map explicitly
-	if currentCyclebleView == "commitFiles" {
-		return "commits"
+			return viewName
+		}
 	}
 
-	return currentCyclebleView
+	return "files" // default
 }