diff --git a/pkg/gui/controllers/helpers/refresh_helper.go b/pkg/gui/controllers/helpers/refresh_helper.go
index 40ce86eae..57f9f586b 100644
--- a/pkg/gui/controllers/helpers/refresh_helper.go
+++ b/pkg/gui/controllers/helpers/refresh_helper.go
@@ -1413,7 +1413,7 @@ func (self *RefreshHelper) refreshStateFiles(captured capturedFilesState, env re
 				self.c.Contexts().Files.GetView().Subtitle = self.c.Tr.FilterLabelConflictingFiles
 			}
 		} else if conflictFileCount == 0 && fileTreeViewModel.GetStatusFilter() == filetree.DisplayConflicted {
-			fileTreeViewModel.SetStatusFilter(filetree.DisplayAll)
+			fileTreeViewModel.SetStatusFilterPreservingSelection(filetree.DisplayAll)
 			self.c.Contexts().Files.GetView().Subtitle = ""
 		}
 
diff --git a/pkg/integration/tests/branch/rebase_conflicts_fix_build_errors_with_out_of_date_submodule.go b/pkg/integration/tests/branch/rebase_conflicts_fix_build_errors_with_out_of_date_submodule.go
index 1b95fd316..29db1a212 100644
--- a/pkg/integration/tests/branch/rebase_conflicts_fix_build_errors_with_out_of_date_submodule.go
+++ b/pkg/integration/tests/branch/rebase_conflicts_fix_build_errors_with_out_of_date_submodule.go
@@ -75,8 +75,8 @@ var RebaseConflictsFixBuildErrorsWithOutOfDateSubmodule = NewIntegrationTest(New
 
 		t.Views().Files().
 			Lines(
-				Equals("▼ /").IsSelected(),
-				Equals("  MM file"),
+				Equals("▼ /"),
+				Equals("  MM file").IsSelected(),
 				Equals("   M submodule (submodule)"),
 				Equals("  ?? untracked-file"),
 			)
@@ -90,8 +90,8 @@ var RebaseConflictsFixBuildErrorsWithOutOfDateSubmodule = NewIntegrationTest(New
 
 		t.Views().Files().
 			Lines(
-				Equals("▼ /").IsSelected(),
-				Equals("   M submodule (submodule)"),
+				Equals("▼ /"),
+				Equals("   M submodule (submodule)").IsSelected(),
 				Equals("  ?? untracked-file"),
 			)
 
diff --git a/pkg/integration/tests/conflicts/resolve_multiple_files.go b/pkg/integration/tests/conflicts/resolve_multiple_files.go
index 5a8f9447e..b38f59ee2 100644
--- a/pkg/integration/tests/conflicts/resolve_multiple_files.go
+++ b/pkg/integration/tests/conflicts/resolve_multiple_files.go
@@ -34,6 +34,7 @@ var ResolveMultipleFiles = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("First Change"),
 				Contains("======="),
 			).
+			SelectNextItem().
 			PressPrimaryAction()
 
 		t.Views().Files().
@@ -47,12 +48,14 @@ var ResolveMultipleFiles = NewIntegrationTest(NewIntegrationTestArgs{
 		t.Views().MergeConflicts().
 			IsFocused().
 			SelectedLines(
-				Contains("<<<<<<< HEAD"),
-				Contains("First Change"),
 				Contains("======="),
+				Contains("Second Change"),
+				Contains(">>>>>>>"),
 			).
 			PressPrimaryAction()
 
+		t.Views().Files().SelectedLines(Contains("file2"))
+
 		t.Common().ContinueOnConflictsResolved("merge")
 	},
 })
diff --git a/pkg/integration/tests/file/discard_various_changes_range_select.go b/pkg/integration/tests/file/discard_various_changes_range_select.go
index 16ecedd04..2199f1278 100644
--- a/pkg/integration/tests/file/discard_various_changes_range_select.go
+++ b/pkg/integration/tests/file/discard_various_changes_range_select.go
@@ -46,12 +46,12 @@ var DiscardVariousChangesRangeSelect = NewIntegrationTest(NewIntegrationTestArgs
 					Cancel()
 			}).
 			Lines(
-				Equals("▼ /").IsSelected(),
+				Equals("▼ /"),
 				Equals("  AM added-changed.txt"),
 				Equals("  MD change-delete.txt"),
 				Equals("  D  delete-change.txt"),
 				Equals("  D  deleted-staged.txt"),
-				Equals("   D deleted.txt"),
+				Equals("   D deleted.txt").IsSelected(),
 				Equals("  MM double-modded.txt"),
 				Equals("  M  modded-staged.txt"),
 				Equals("   M modded.txt"),
@@ -59,6 +59,7 @@ var DiscardVariousChangesRangeSelect = NewIntegrationTest(NewIntegrationTestArgs
 				Equals("  ?? new.txt"),
 				Equals("  R  renamed.txt → renamed2.txt"),
 			).
+			NavigateToLine(Equals("▼ /")).
 			Press(keys.Universal.ToggleRangeSelect).
 			NavigateToLine(Contains("renamed.txt")).
 			Press(keys.Universal.Remove).
diff --git a/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go b/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go
index 1a09cea7a..d9f99a703 100644
--- a/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go
+++ b/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go
@@ -83,11 +83,10 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
 		t.Views().Files().
 			Focus().
 			Lines(
-				Equals("▼ /").IsSelected(),
-				Equals("  M  file1"),
+				Equals("▼ /"),
+				Equals("  M  file1").IsSelected(),
 				Equals("  M  file2"),
-			).
-			SelectNextItem()
+			)
 
 		t.Views().Main().
 			ContainsLines(