diff --git a/extension/bwcontest/src/extension.ts b/extension/bwcontest/src/extension.ts
index f6722a8..b232092 100644
--- a/extension/bwcontest/src/extension.ts
+++ b/extension/bwcontest/src/extension.ts
@@ -76,19 +76,11 @@ export async function cloneAndOpenRepo(contestId: number, teamId: number) {
 		fs.removeSync(clonedRepoPath);
 	}
 
-	// child_process.exec(
-	// 	`git clone ${repoUrl}`,
-	// 	{ cwd: `${currentSettings.repoClonePath}/BWContest/${contestId.toString()}` },
-	// 	(error, stdout, stderr) => {
-	// 		if (error) {
-	// 			vscode.window.showErrorMessage(`BWContest: Failed to clone repo: ${error.message}`);
-	// 			return;
-	// 		}
-	// 	}
-	// );
-	const dir = path.join(currentSettings.repoClonePath, 'BWContest', contestId.toString());
+	const dir = path.join(currentSettings.repoClonePath, 'BWContest', contestId.toString(), repoName);
 	await git.clone({ fs, http, dir, url: repoUrl });
 
+	closeAllWorkspaces();
+
 	const addedFolder = vscode.workspace.updateWorkspaceFolders(
 		vscode.workspace.workspaceFolders?.length ?? 0,
 		0,