diff --git a/CMakeScripts/ConfigCPack.cmake b/CMakeScripts/ConfigCPack.cmake
index b0f773129b5b2efe6f5c430fe2a83ce49163cd6f..5e7ac72d1c41c0389e31602b1eaa0d44a48e7230 100644
--- a/CMakeScripts/ConfigCPack.cmake
+++ b/CMakeScripts/ConfigCPack.cmake
@@ -73,10 +73,13 @@ file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}/packaging/nsis/fileassoc.nsh" native_pa
 string(REPLACE "\\" "\\\\" native_path "${native_path}")
 set(CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS "!include ${native_path}")
 set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "\
+  WriteRegStr SHCTX 'SOFTWARE\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\App Paths\\\\inkscape.exe' '' '$INSTDIR\\\\bin\\\\inkscape.exe'\n\
+  WriteRegStr SHCTX 'SOFTWARE\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\App Paths\\\\inkscape.exe' 'Path' '$INSTDIR\\\\bin'\n\
   !insertmacro APP_ASSOCIATE 'svg' 'Inkscape.SVG' 'Scalable Vector Graphics' '$INSTDIR\\\\bin\\\\inkscape.exe,0' 'Open with Inkscape' '$INSTDIR\\\\bin\\\\inkscape.exe \\\"%1\\\"'\n\
   !insertmacro APP_ASSOCIATE 'svgz' 'Inkscape.SVGZ' 'Compressed Scalable Vector Graphics' '$INSTDIR\\\\bin\\\\inkscape.exe,0' 'Open with Inkscape' '$INSTDIR\\\\bin\\\\inkscape.exe \\\"%1\\\"'\n\
   !insertmacro UPDATEFILEASSOC")
 set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "\
+  DeleteRegKey SHCTX 'SOFTWARE\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\App Paths\\\\inkscape.exe'\n\
   !insertmacro APP_UNASSOCIATE 'svg' 'Inkscape.SVG'\n\
   !insertmacro APP_UNASSOCIATE 'svgz' 'Inkscape.SVGZ'\n\
   !insertmacro UPDATEFILEASSOC")
@@ -92,7 +95,7 @@ set(CPACK_WIX_PROPERTY_ARPURLUPDATEINFO "${CPACK_PACKAGE_HOMEPAGE_URL}/release")
 set(CPACK_WIX_ROOT_FEATURE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
 set(CPACK_WIX_LIGHT_EXTRA_FLAGS "-dcl:high") # set high compression
 
-set(CPACK_WIX_PATCH_FILE "${CMAKE_SOURCE_DIR}/packaging/wix/file_association.xml"
+set(CPACK_WIX_PATCH_FILE "${CMAKE_SOURCE_DIR}/packaging/wix/app_registration.xml"
                          "${CMAKE_SOURCE_DIR}/packaging/wix/feature_attributes.xml")
 
 # DEB (Linux .deb bundle)
diff --git a/packaging/wix/file_association.xml b/packaging/wix/app_registration.xml
similarity index 69%
rename from packaging/wix/file_association.xml
rename to packaging/wix/app_registration.xml
index b3a95656cd26c8641e714fcce9eb55cf5aceb1da..0ab87aed3a50723683e2220c50ddb71f9cfb2c0f 100644
--- a/packaging/wix/file_association.xml
+++ b/packaging/wix/app_registration.xml
@@ -10,5 +10,9 @@
             <Verb Id="open" TargetFile='CM_FP_inkscape.bin.inkscape.exe' Argument="&quot;%1&quot;" />
         </Extension>
     </ProgId>
+    <RegistryKey Key="SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\inkscape.exe" Root="HKLM">
+        <RegistryValue Type="string" Value="[#CM_FP_inkscape.bin.inkscape.exe]"/>
+        <RegistryValue Name="Path" Type="string" Value="[$CM_CP_inkscape.bin.inkscape.exe]"/>
+    </RegistryKey>
   </CPackWiXFragment>
 </CPackWiXPatch>