diff --git a/Source/MSBuild.Sdk.Extras/Build/ExtrasShim.targets b/Source/MSBuild.Sdk.Extras/Build/ExtrasShim.targets
index 799add0..635875b 100644
--- a/Source/MSBuild.Sdk.Extras/Build/ExtrasShim.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/ExtrasShim.targets
@@ -26,7 +26,7 @@
     <UseWindowsForms Condition="'$(UseWindowsForms)' == '' and '$(ExtrasEnableWinFormsProjectSetup)' == 'true' ">true</UseWindowsForms>
 
     <!-- Until there's a discreet property for this, default based on Wpf/WinForms -->
-    <ExtrasUseWindowsDesktopApp Condition="'$(UseWpf)' == 'true' or '$(UseWindowsForms)' == 'true'">true</ExtrasUseWindowsDesktopApp>
+    <ExtrasUseWindowsDesktopApp Condition="'$(_ExtrasHasDesktopSdk)' == 'true' and ('$(UseWpf)' == 'true' or '$(UseWindowsForms)' == 'true')">true</ExtrasUseWindowsDesktopApp>
     <ExtrasUseWindowsDesktopApp Condition="'$(ExtrasUseWindowsDesktopApp)' == '' ">false</ExtrasUseWindowsDesktopApp>
   </PropertyGroup>