diff --git a/installer/PowerToysSetup/CmdNotFound.wxs b/installer/PowerToysSetup/CmdNotFound.wxs
index b2a362ec7d..3429df960c 100644
--- a/installer/PowerToysSetup/CmdNotFound.wxs
+++ b/installer/PowerToysSetup/CmdNotFound.wxs
@@ -5,24 +5,18 @@
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
   <Fragment>
-    <DirectoryRef Id="CmdNotFoundInstallFolder" FileSource="$(var.BinDir)modules\$(var.CmdNotFoundProjectName)">
+    <DirectoryRef Id="INSTALLFOLDER" FileSource="$(var.BinDir)">
       <!-- !Warning! Make sure to change Component Guid if you update the file list -->
       <Component Id="Module_CmdNotFound" Win64="yes" Guid="80F648F2-29F6-4685-AED4-04DC1B6EE176">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_CmdNotFound" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Source="$(var.BinDir)modules\$(var.CmdNotFoundProjectName)\PowerToys.CmdNotFoundModuleInterface.dll" />
-        <File Source="$(var.BinDir)modules\$(var.CmdNotFoundProjectName)\PowerToys.CommandNotFound.dll" />
+        <File Source="$(var.BinDir)WinGetCommandNotFound.psd1" />
+        <!-- The dllss will be picked up by BaseApplications generateAllFileComponents.ps1-->
       </Component>
     </DirectoryRef>
 
     <ComponentGroup Id="CmdNotFoundComponentGroup">
-      <Component Id="RemoveCmdNotFoundFolder" Guid="C32B0224-2965-4082-BC20-600AD93F872F" Directory="CmdNotFoundInstallFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveCmdNotFoundFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderCmdNotFoundInstallFolder" Directory="CmdNotFoundInstallFolder" On="uninstall"/>
-      </Component>
       <ComponentRef Id="Module_CmdNotFound" />
     </ComponentGroup>
 
diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
index d88a6ff5a8..ee15ec090a 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -72,6 +72,7 @@
       <ComponentGroupRef Id="VideoConferenceComponentGroup" />
       <ComponentGroupRef Id="MouseWithoutBordersComponentGroup" />
       <ComponentGroupRef Id="EnvironmentVariablesComponentGroup" />
+      <ComponentGroupRef Id="CmdNotFoundComponentGroup" />
         
       <ComponentGroupRef Id="ResourcesComponentGroup" />
       <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Scripts/EnableModule.ps1 b/src/settings-ui/Settings.UI/Assets/Settings/Scripts/EnableModule.ps1
index 85227c87c8..844613a2be 100644
--- a/src/settings-ui/Settings.UI/Assets/Settings/Scripts/EnableModule.ps1
+++ b/src/settings-ui/Settings.UI/Assets/Settings/Scripts/EnableModule.ps1
@@ -32,7 +32,7 @@ if ((-not [string]::IsNullOrEmpty($profileContent)) -and ($profileContent.Contai
 else
 {
   Add-Content -Path $PROFILE  -Value "`r`n#34de4b3d-13a8-4540-b76d-b9e8d3851756 PowerToys CommandNotFound module"
-  Add-Content -Path $PROFILE  -Value "`r`nImport-Module $scriptPath\WinGetCommandNotFound.psd1"
+  Add-Content -Path $PROFILE  -Value "`r`nImport-Module `"$scriptPath\WinGetCommandNotFound.psd1`""
   Add-Content -Path $PROFILE  -Value "#34de4b3d-13a8-4540-b76d-b9e8d3851756"  
   Write-Host "Module was successfully registered in the profile file."
 }