diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 5543967dfa..5cb68686ad 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -840,10 +840,12 @@ jobs:
               # has no stable disk location, its an MS-DOS batch file setting env,
               # and makes it problematic to use from this script.
               [[ "$(uname -s)" = *'ARM64'* ]] && MSVC_HOST='arm64' || MSVC_HOST='x64'  # x86
-              MSVC_ROOTW="$(cygpath --dos "$(/usr/bin/find "$PROGRAMFILES/Microsoft Visual Studio/2022/Community/vc/tools/msvc" -mindepth 1 -maxdepth 1 -type d | head -n 1)")"
+              MSVC_ROOTD="$(cygpath --dos "$PROGRAMFILES/Microsoft Visual Studio")"  # to avoid spaces
+              MSVC_ROOTU="$(/usr/bin/find "$(cygpath --unix "$MSVC_ROOTD/2022/Community/vc/tools/msvc")" -mindepth 1 -maxdepth 1 -type d | head -n 1)"
+              MSVC_ROOTW="$(cygpath --windows "$MSVC_ROOTU")"
               MSVC_ROOTU="$(cygpath --unix "$MSVC_ROOTW")"
               MSVC_BINU="$MSVC_ROOTU/bin/Host$MSVC_HOST/$MATRIX_ARCH"
-              MSDK_ROOTW="$(cygpath --dos "$(printenv 'ProgramFiles(x86)')/Windows Kits/10")"
+              MSDK_ROOTW="$(cygpath --dos "$(printenv 'ProgramFiles(x86)')/Windows Kits")/10"
               MSDK_ROOTU="$(cygpath --unix "$MSDK_ROOTW")"
               MSDK_VER="$(basename "$(/usr/bin/find "$MSDK_ROOTU/lib" -mindepth 1 -maxdepth 1 -type d | head -n 1)")"
               MSDK_LIBW="$MSDK_ROOTW/lib/$MSDK_VER"