diff --git a/windows/NSIS.template.in b/windows/NSIS.template.in
index bbc0bafa5..09b26493b 100644
--- a/windows/NSIS.template.in
+++ b/windows/NSIS.template.in
@@ -37,7 +37,7 @@ Unicode true
   !include "..\..\..\resources\NSIS.definitions.nsh"
   !include "FileFunc.nsh"
   !AddIncludeDir "${INSTALLER_SOURCE_DIRECTORY}"
-
+  !AddPluginDir "${INSTALLER_SOURCE_DIRECTORY}\nsis-plugin\x86-unicode"
   ; Compression
   SetCompressor /SOLID lzma
 
@@ -208,7 +208,8 @@ SectionGroup /e "-Thymio" GroupThymio
 		SetShellVarContext all		; current / all. Install program for all users
 		; Launcher
 			CreateShortCut "$SMPROGRAMS\Thymio Suite.lnk" "$INSTDIR\bin\thymio-launcher.exe" "$INSTDIR\thymio-launcher.ico"
-
+			ApplicationID::Set "$SMPROGRAMS\Thymio Suite.lnk" "org.mobsya.ThymioSuite"
+			
 		@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
 	SectionEnd
 
diff --git a/windows/nsis-plugin/x86-unicode/ApplicationID.dll b/windows/nsis-plugin/x86-unicode/ApplicationID.dll
new file mode 100644
index 000000000..5fc048025
Binary files /dev/null and b/windows/nsis-plugin/x86-unicode/ApplicationID.dll differ