diff --git a/gitbutler-app/src/virtual_branches/virtual.rs b/gitbutler-app/src/virtual_branches/virtual.rs
index 748bc892a..f50050a0a 100644
--- a/gitbutler-app/src/virtual_branches/virtual.rs
+++ b/gitbutler-app/src/virtual_branches/virtual.rs
@@ -983,6 +983,7 @@ fn branches_with_hunk_locks(
     let all_commits: Vec<VirtualBranchCommit> = branches
         .clone()
         .iter()
+        .filter(|branch| branch.active)
         .flat_map(|vbranch| vbranch.commits.clone())
         .collect();