diff --git a/resources/win32/bin/code.sh b/resources/win32/bin/code.sh
index 4fbdd0a3b51..9f029e5522a 100644
--- a/resources/win32/bin/code.sh
+++ b/resources/win32/bin/code.sh
@@ -13,40 +13,46 @@ NAME="@@NAME@@"
 DATAFOLDER="@@DATAFOLDER@@"
 VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")"
 ELECTRON="$VSCODE_PATH/$NAME.exe"
-if grep -qi Microsoft /proc/version; then
-	# in a wsl shell
-	WSL_BUILD=$(uname -r | sed -E 's/^[0-9.]+-([0-9]+)-Microsoft.*|([0-9]+).([0-9]+).([0-9]+)-microsoft.*|.*/\1\2\3\4/')
-	if [ -z "$WSL_BUILD" ]; then
-		WSL_BUILD=0
-	fi
 
-	if [ $WSL_BUILD -ge 17063 ]; then
-		# $WSL_DISTRO_NAME is available since WSL builds 18362, also for WSL2
-		# WSLPATH is available since WSL build 17046
-		# WSLENV is available since WSL build 17063
-		export WSLENV=ELECTRON_RUN_AS_NODE/w:$WSLENV
-		CLI=$(wslpath -m "$VSCODE_PATH/resources/app/out/cli.js")
-
-		# use the Remote WSL extension if installed
-		WSL_EXT_ID="ms-vscode-remote.remote-wsl"
-
-		ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --locate-extension $WSL_EXT_ID >/tmp/remote-wsl-loc.txt 2>/dev/null
-		WSL_EXT_WLOC=$(cat /tmp/remote-wsl-loc.txt)
-
-		if [ -n "$WSL_EXT_WLOC" ]; then
-			# replace \r\n with \n in WSL_EXT_WLOC
-			WSL_CODE=$(wslpath -u "${WSL_EXT_WLOC%%[[:cntrl:]]}")/scripts/wslCode.sh
-			"$WSL_CODE" "$COMMIT" "$QUALITY" "$ELECTRON" "$APP_NAME" "$DATAFOLDER" "$@"
+IN_WSL=false
+if [ -n "$WSL_DISTRO_NAME" ]; then
+	# $WSL_DISTRO_NAME is available since WSL builds 18362, also for WSL2
+	IN_WSL=true
+else
+	WSL_BUILD=$(uname -r | sed -E 's/^[0-9.]+-([0-9]+)-Microsoft.*|.*/\1/')
+	if [ -n "$WSL_BUILD" ]; then
+		if [ "$WSL_BUILD" -ge 17063 ]; then
+			# WSLPATH is available since WSL build 17046
+			# WSLENV is available since WSL build 17063
+			IN_WSL=true
+		else
+			# If running under older WSL, don't pass cli.js to Electron as
+			# environment vars cannot be transferred from WSL to Windows
+			# See: https://github.com/Microsoft/BashOnWindows/issues/1363
+			#      https://github.com/Microsoft/BashOnWindows/issues/1494
+			"$ELECTRON" "$@"
 			exit $?
 		fi
-	else
-		# If running under older WSL, don't pass cli.js to Electron as
-		# environment vars cannot be transferred from WSL to Windows
-		# See: https://github.com/Microsoft/BashOnWindows/issues/1363
-		#      https://github.com/Microsoft/BashOnWindows/issues/1494
-		"$ELECTRON" "$@"
+	fi
+fi
+if [ $IN_WSL = true ]; then
+
+	export WSLENV=ELECTRON_RUN_AS_NODE/w:$WSLENV
+	CLI=$(wslpath -m "$VSCODE_PATH/resources/app/out/cli.js")
+
+	# use the Remote WSL extension if installed
+	WSL_EXT_ID="ms-vscode-remote.remote-wsl"
+
+	ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --locate-extension $WSL_EXT_ID >/tmp/remote-wsl-loc.txt 2>/dev/null
+	WSL_EXT_WLOC=$(cat /tmp/remote-wsl-loc.txt)
+
+	if [ -n "$WSL_EXT_WLOC" ]; then
+		# replace \r\n with \n in WSL_EXT_WLOC
+		WSL_CODE=$(wslpath -u "${WSL_EXT_WLOC%%[[:cntrl:]]}")/scripts/wslCode.sh
+		"$WSL_CODE" "$COMMIT" "$QUALITY" "$ELECTRON" "$APP_NAME" "$DATAFOLDER" "$@"
 		exit $?
 	fi
+
 elif [ -x "$(command -v cygpath)" ]; then
 	CLI=$(cygpath -m "$VSCODE_PATH/resources/app/out/cli.js")
 else