diff --git a/pkg/gui/context/context.go b/pkg/gui/context/context.go
index ecb0e6da4..7008f7d14 100644
--- a/pkg/gui/context/context.go
+++ b/pkg/gui/context/context.go
@@ -124,10 +124,10 @@ func (self *ContextTree) Flatten() []types.Context {
 		self.Status,
 		self.Snake,
 		self.Submodules,
+		self.Worktrees,
 		self.Files,
 		self.SubCommits,
 		self.Remotes,
-		self.Worktrees,
 		self.RemoteBranches,
 		self.Tags,
 		self.Branches,
diff --git a/pkg/integration/tests/worktree/add_from_branch.go b/pkg/integration/tests/worktree/add_from_branch.go
index 53636536d..70aa4dd60 100644
--- a/pkg/integration/tests/worktree/add_from_branch.go
+++ b/pkg/integration/tests/worktree/add_from_branch.go
@@ -55,6 +55,11 @@ var AddFromBranch = NewIntegrationTest(NewIntegrationTestArgs{
 			Lines(
 				Contains("mybranch").IsSelected(),
 				Contains("newbranch (worktree)"),
-			)
+			).
+			// Confirm the files view is still showing in the files window
+			Press(keys.Universal.PrevBlock)
+
+		t.Views().Files().
+			IsFocused()
 	},
 })