diff --git a/cli/src/movement_util.rs b/cli/src/movement_util.rs
index da66fe82bb8..3f257cd0e64 100644
--- a/cli/src/movement_util.rs
+++ b/cli/src/movement_util.rs
@@ -124,10 +124,10 @@ impl Direction {
         let target_revset = match (self, args.conflict) {
             (Direction::Next, true) => start_revset
                 .children()
+                .minus(working_revset)
                 .descendants()
                 .filtered(RevsetFilterPredicate::HasConflict)
-                .roots()
-                .minus(working_revset),
+                .roots(),
             (Direction::Next, false) => start_revset
                 .descendants_at(args.offset)
                 .minus(working_revset),