diff --git a/src/commands/git/show.ts b/src/commands/git/show.ts
index 16fdbe9..710eae7 100644
--- a/src/commands/git/show.ts
+++ b/src/commands/git/show.ts
@@ -149,8 +149,11 @@ export class ShowGitCommand extends QuickCommand<State> {
 				if (result === StepResult.Break) continue;
 
 				if (result instanceof GitCommandQuickPickItem) {
-					yield* result.executeSteps(this.pickedVia);
+					const r = yield* result.executeSteps(this.pickedVia);
 					state.counter--;
+					if (r === StepResult.Break) {
+						QuickCommand.endSteps(state);
+					}
 
 					continue;
 				}
diff --git a/src/commands/git/status.ts b/src/commands/git/status.ts
index 609baa1..92fc0d9 100644
--- a/src/commands/git/status.ts
+++ b/src/commands/git/status.ts
@@ -107,8 +107,11 @@ export class StatusGitCommand extends QuickCommand<State> {
 			}
 
 			if (result instanceof GitCommandQuickPickItem) {
-				yield* result.executeSteps(this.pickedVia);
+				const r = yield* result.executeSteps(this.pickedVia);
 				state.counter--;
+				if (r === StepResult.Break) {
+					QuickCommand.endSteps(state);
+				}
 
 				continue;
 			}