diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts
index 053fc2f..3fdf452 100644
--- a/src/env/node/git/localGitProvider.ts
+++ b/src/env/node/git/localGitProvider.ts
@@ -503,7 +503,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 					this.container,
 					this.onRepositoryChanged.bind(this),
 					this.descriptor,
-					folder,
+					folder ?? workspace.getWorkspaceFolder(uri),
 					uri,
 					root,
 					suspended ?? !window.state.focused,
@@ -514,7 +514,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 					this.container,
 					this.onRepositoryChanged.bind(this),
 					this.descriptor,
-					folder,
+					folder ?? workspace.getWorkspaceFolder(canonicalUri),
 					canonicalUri,
 					root,
 					suspended ?? !window.state.focused,
@@ -529,7 +529,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 				this.container,
 				this.onRepositoryChanged.bind(this),
 				this.descriptor,
-				folder,
+				folder ?? workspace.getWorkspaceFolder(uri),
 				uri,
 				root,
 				suspended ?? !window.state.focused,
diff --git a/src/git/models/repository.ts b/src/git/models/repository.ts
index 5975f8e..1b431ed 100644
--- a/src/git/models/repository.ts
+++ b/src/git/models/repository.ts
@@ -226,7 +226,6 @@ export class Repository implements Disposable {
 		suspended: boolean,
 		closed: boolean = false,
 	) {
-		folder = workspace.getWorkspaceFolder(uri) ?? folder;
 		if (folder != null) {
 			if (root) {
 				this.name = folder.name;
diff --git a/src/plus/github/githubGitProvider.ts b/src/plus/github/githubGitProvider.ts
index 6832633..5c73bea 100644
--- a/src/plus/github/githubGitProvider.ts
+++ b/src/plus/github/githubGitProvider.ts
@@ -261,7 +261,7 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 				this.container,
 				this.onRepositoryChanged.bind(this),
 				this.descriptor,
-				folder,
+				folder ?? workspace.getWorkspaceFolder(uri),
 				uri,
 				root,
 				suspended ?? !window.state.focused,