diff --git a/extensions/github-authentication/src/common/env.ts b/extensions/github-authentication/src/common/env.ts
index b40c249d40a..2f6e7970313 100644
--- a/extensions/github-authentication/src/common/env.ts
+++ b/extensions/github-authentication/src/common/env.ts
@@ -7,7 +7,11 @@ import { Uri } from 'vscode';
 const VALID_DESKTOP_CALLBACK_SCHEMES = [
 	'vscode',
 	'vscode-insiders',
-	'code-oss',
+	// On Windows, some browsers don't seem to redirect back to OSS properly.
+	// As a result, you get stuck in the auth flow. We exclude this from the
+	// list until we can figure out a way to fix this behavior in browsers.
+	// The behavior was experienced on Windows.
+	// 'code-oss',
 	'vscode-wsl',
 	'vscode-exploration'
 ];
diff --git a/extensions/github-authentication/src/github.ts b/extensions/github-authentication/src/github.ts
index 824c3d3aff6..00088001dd7 100644
--- a/extensions/github-authentication/src/github.ts
+++ b/extensions/github-authentication/src/github.ts
@@ -45,7 +45,9 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
 		if (this.type === AuthProviderType.github) {
 			this._githubServer = new GitHubServer(
 				// We only can use the Device Code flow when we are running with a remote extension host.
-				context.extension.extensionKind === vscode.ExtensionKind.Workspace,
+				context.extension.extensionKind === vscode.ExtensionKind.Workspace
+				// This should only matter when we are running in code-oss. See the other change in this commit.
+				|| vscode.env.uiKind === vscode.UIKind.Desktop,
 				this._logger,
 				this._telemetryReporter);
 		} else {