diff --git a/GoogleTestAdapter/NewProjectWizard/WizardImplementation.cs b/GoogleTestAdapter/NewProjectWizard/WizardImplementation.cs
index 98b023f2b..fb1d7d386 100644
--- a/GoogleTestAdapter/NewProjectWizard/WizardImplementation.cs
+++ b/GoogleTestAdapter/NewProjectWizard/WizardImplementation.cs
@@ -152,21 +152,32 @@ public void RunStarted(object automationObject,
 
                     if (latestSdk == null)
                     {
+                        MessageBox.Show(Resources.WinSDKNotFound);
                         throw new WizardCancelledException(Resources.WinSDKNotFound);
                     }
 
-                    List<Platform> allPlatformsForLatestSdk = ToolLocationHelper.GetPlatformsForSDK("Windows", latestSdk.TargetPlatformVersion)
-                        .Select(moniker => TryParsePlatformVersion(moniker))
-                        .Where(name => name != null)
-                        .OrderByDescending(p => p.Version).ToList();
-                    Platform latestPlatform = allPlatformsForLatestSdk.FirstOrDefault();
+                    string versionString;
 
-                    if (latestPlatform == null)
+                    if (latestSdk.TargetPlatformVersion.Revision >= 10)
                     {
-                        throw new WizardCancelledException(Resources.WinSDKNotFound);
-                    }
+                        List<Platform> allPlatformsForLatestSdk = ToolLocationHelper.GetPlatformsForSDK("Windows", latestSdk.TargetPlatformVersion)
+                            .Select(moniker => TryParsePlatformVersion(moniker))
+                            .Where(name => name != null)
+                            .OrderByDescending(p => p.Version).ToList();
+                        Platform latestPlatform = allPlatformsForLatestSdk.FirstOrDefault();
+
+                        if (latestPlatform == null)
+                        {
+                            MessageBox.Show(Resources.WinSDKNotFound);
+                            throw new WizardCancelledException(Resources.WinSDKNotFound);
+                        }
 
-                    string versionString = latestPlatform.Version.ToString();
+                        versionString = latestPlatform.Version.ToString();
+                    }
+                    else
+                    {
+                        versionString = latestSdk.TargetPlatformVersion.ToString();
+                    }
 
                     replacementsDictionary[TargetPlatformVersion] = versionString;
                 }