diff --git a/src/commands/git/cherry-pick.ts b/src/commands/git/cherry-pick.ts
index fc834ff..1200d5f 100644
--- a/src/commands/git/cherry-pick.ts
+++ b/src/commands/git/cherry-pick.ts
@@ -105,7 +105,9 @@ export class CherryPickGitCommand extends QuickCommand<State> {
 				skippedStepOne = false;
 				if (context.repos.length === 1) {
 					skippedStepOne = true;
-					state.counter++;
+					if (state.repo == null) {
+						state.counter++;
+					}
 
 					state.repo = context.repos[0];
 				} else {
diff --git a/src/commands/git/coauthors.ts b/src/commands/git/coauthors.ts
index 57337f6..2982c1b 100644
--- a/src/commands/git/coauthors.ts
+++ b/src/commands/git/coauthors.ts
@@ -124,7 +124,9 @@ export class CoAuthorsGitCommand extends QuickCommand<State> {
 				skippedStepOne = false;
 				if (context.repos.length === 1) {
 					skippedStepOne = true;
-					state.counter++;
+					if (state.repo == null) {
+						state.counter++;
+					}
 
 					state.repo = context.repos[0];
 				} else {
diff --git a/src/commands/git/log.ts b/src/commands/git/log.ts
index c3573a1..35610f6 100644
--- a/src/commands/git/log.ts
+++ b/src/commands/git/log.ts
@@ -91,7 +91,9 @@ export class LogGitCommand extends QuickCommand<State> {
 				skippedStepOne = false;
 				if (context.repos.length === 1) {
 					skippedStepOne = true;
-					state.counter++;
+					if (state.repo == null) {
+						state.counter++;
+					}
 
 					state.repo = context.repos[0];
 				} else {
diff --git a/src/commands/git/merge.ts b/src/commands/git/merge.ts
index c99cfe8..d84c4c0 100644
--- a/src/commands/git/merge.ts
+++ b/src/commands/git/merge.ts
@@ -98,7 +98,9 @@ export class MergeGitCommand extends QuickCommand<State> {
 				skippedStepOne = false;
 				if (context.repos.length === 1) {
 					skippedStepOne = true;
-					state.counter++;
+					if (state.repo == null) {
+						state.counter++;
+					}
 
 					state.repo = context.repos[0];
 				} else {
diff --git a/src/commands/git/rebase.ts b/src/commands/git/rebase.ts
index dac3252..96a95c2 100644
--- a/src/commands/git/rebase.ts
+++ b/src/commands/git/rebase.ts
@@ -99,7 +99,9 @@ export class RebaseGitCommand extends QuickCommand<State> {
 				skippedStepOne = false;
 				if (context.repos.length === 1) {
 					skippedStepOne = true;
-					state.counter++;
+					if (state.repo == null) {
+						state.counter++;
+					}
 
 					state.repo = context.repos[0];
 				} else {
diff --git a/src/commands/git/reset.ts b/src/commands/git/reset.ts
index ed4504f..e9f0c1c 100644
--- a/src/commands/git/reset.ts
+++ b/src/commands/git/reset.ts
@@ -90,7 +90,9 @@ export class ResetGitCommand extends QuickCommand<State> {
 				skippedStepOne = false;
 				if (context.repos.length === 1) {
 					skippedStepOne = true;
-					state.counter++;
+					if (state.repo == null) {
+						state.counter++;
+					}
 
 					state.repo = context.repos[0];
 				} else {
diff --git a/src/commands/git/revert.ts b/src/commands/git/revert.ts
index f9a81ad..1464907 100644
--- a/src/commands/git/revert.ts
+++ b/src/commands/git/revert.ts
@@ -89,7 +89,9 @@ export class RevertGitCommand extends QuickCommand<State> {
 				skippedStepOne = false;
 				if (context.repos.length === 1) {
 					skippedStepOne = true;
-					state.counter++;
+					if (state.repo == null) {
+						state.counter++;
+					}
 
 					state.repo = context.repos[0];
 				} else {
diff --git a/src/commands/git/search.ts b/src/commands/git/search.ts
index 9905651..f235fd6 100644
--- a/src/commands/git/search.ts
+++ b/src/commands/git/search.ts
@@ -116,7 +116,9 @@ export class SearchGitCommand extends QuickCommand<State> {
 				skippedStepOne = false;
 				if (context.repos.length === 1) {
 					skippedStepOne = true;
-					state.counter++;
+					if (state.repo == null) {
+						state.counter++;
+					}
 
 					state.repo = context.repos[0];
 				} else {
diff --git a/src/commands/git/show.ts b/src/commands/git/show.ts
index 3aa1b5f..16fdbe9 100644
--- a/src/commands/git/show.ts
+++ b/src/commands/git/show.ts
@@ -89,7 +89,9 @@ export class ShowGitCommand extends QuickCommand<State> {
 				skippedStepOne = false;
 				if (context.repos.length === 1) {
 					skippedStepOne = true;
-					state.counter++;
+					if (state.repo == null) {
+						state.counter++;
+					}
 
 					state.repo = context.repos[0];
 				} else {
diff --git a/src/commands/git/status.ts b/src/commands/git/status.ts
index 0ab6d6d..609baa1 100644
--- a/src/commands/git/status.ts
+++ b/src/commands/git/status.ts
@@ -69,7 +69,9 @@ export class StatusGitCommand extends QuickCommand<State> {
 				skippedStepOne = false;
 				if (context.repos.length === 1) {
 					skippedStepOne = true;
-					state.counter++;
+					if (state.repo == null) {
+						state.counter++;
+					}
 
 					state.repo = context.repos[0];
 				} else {