diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts
index 0b96647a25a..cb7d6c1e190 100644
--- a/extensions/git/src/model.ts
+++ b/extensions/git/src/model.ts
@@ -542,6 +542,11 @@ export class Model implements Disposable {
 			} catch (err) {
 				if (err.gitErrorCode === GitErrorCodes.NotAGitRepository) {
 					this.repositoryDisposable.dispose();
+
+					const disposables: Disposable[] = [];
+					this.onWorkspaceChange(this.onFSChange, this, disposables);
+					this.repositoryDisposable = combinedDisposable(disposables);
+
 					this.state = State.NotAGitRepository;
 				}