diff --git a/pkg/commands/git_commands/bisect_info.go b/pkg/commands/git_commands/bisect_info.go
index c49d6866f..7eb5cda59 100644
--- a/pkg/commands/git_commands/bisect_info.go
+++ b/pkg/commands/git_commands/bisect_info.go
@@ -63,6 +63,21 @@ func (self *BisectInfo) GetCurrentHash() string {
 	return self.current
 }
 
+// Whether git has checked out a commit for the user to test, and the user
+// hasn't marked it yet. After the user marks it, git checks out the next one,
+// unless there's nothing left to test. This is the case if git has found the
+// first new commit, or if only skipped commits are left. Git checks out the
+// first commit to test once it knows both a new and an old commit, unless the
+// old commit is a parent of the new one.
+func (self *BisectInfo) HasCommitToTest() bool {
+	if self.current == "" {
+		return false
+	}
+
+	_, marked := self.statusMap[self.current]
+	return !marked
+}
+
 func (self *BisectInfo) GetStartHash() string {
 	return self.start
 }
diff --git a/pkg/gui/controllers/helpers/refresh_helper.go b/pkg/gui/controllers/helpers/refresh_helper.go
index aa1906a36..20714788f 100644
--- a/pkg/gui/controllers/helpers/refresh_helper.go
+++ b/pkg/gui/controllers/helpers/refresh_helper.go
@@ -1036,13 +1036,20 @@ func findNewBisectCommitToSelect(previousBisectInfo *git_commands.BisectInfo, bi
 }
 
 // Returns the commit that the user needs to look at during a bisect: the one
-// that git wants them to test. Returns "" if there's none.
+// that git wants them to test, or the first bad commit once git has found it.
+// Returns "" if git doesn't know both a good and a bad commit yet.
 func bisectCommitToSelect(bisectInfo *git_commands.BisectInfo) string {
 	if !bisectInfo.Bisecting() {
 		return ""
 	}
 
-	return bisectInfo.GetCurrentHash()
+	if bisectInfo.HasCommitToTest() {
+		return bisectInfo.GetCurrentHash()
+	}
+
+	// There's nothing left to test, so the commit marked bad is the first bad
+	// commit. (If only skipped commits are left, it is one of the candidates.)
+	return bisectInfo.GetNewHash()
 }
 
 // capturedSubCommitState holds the sub-commits refresh's model/context/mode
diff --git a/pkg/integration/tests/bisect/select_first_bad_commit.go b/pkg/integration/tests/bisect/select_first_bad_commit.go
index 1e76cba29..16f86badc 100644
--- a/pkg/integration/tests/bisect/select_first_bad_commit.go
+++ b/pkg/integration/tests/bisect/select_first_bad_commit.go
@@ -34,9 +34,6 @@ var SelectFirstBadCommit = NewIntegrationTest(NewIntegrationTestArgs{
 
 				t.ExpectPopup().Alert().Title(Equals("Bisect complete")).Content(MatchesRegexp("(?s)commit-08.*Do you want to reset")).Cancel()
 			}).
-			/* EXPECTED:
 			SelectedLine(Contains("CI commit-08").Contains("<-- bad"))
-			ACTUAL: */
-			SelectedLine(Contains("CI commit-07"))
 	},
 })
diff --git a/pkg/integration/tests/bisect/select_first_bad_commit_on_startup.go b/pkg/integration/tests/bisect/select_first_bad_commit_on_startup.go
index 00d6f4919..3f0ac6bce 100644
--- a/pkg/integration/tests/bisect/select_first_bad_commit_on_startup.go
+++ b/pkg/integration/tests/bisect/select_first_bad_commit_on_startup.go
@@ -23,9 +23,6 @@ var SelectFirstBadCommitOnStartup = NewIntegrationTest(NewIntegrationTestArgs{
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
 		t.Views().Commits().
 			IsFocused().
-			/* EXPECTED:
 			SelectedLine(Contains("CI commit-08").Contains("<-- bad"))
-			ACTUAL: */
-			SelectedLine(Contains("CI commit-07"))
 	},
 })