diff --git a/windows/installer.wxs b/windows/installer.wxs
index c5455dd5..4a720e40 100644
--- a/windows/installer.wxs
+++ b/windows/installer.wxs
@@ -139,7 +139,15 @@
                   Source="$(var.Builddir)putty.exe" KeyPath="yes">
               <Shortcut Id="startmenuPuTTY" Directory="ProgramMenuDir"
                         WorkingDirectory="INSTALLDIR"
-                        Name="PuTTY" Advertise="no" />
+                        Name="PuTTY" Advertise="no">
+                <!-- Set AppUserModelId to match what PuTTY sets at runtime.
+                     Source for the GUID key:
+https://msdn.microsoft.com/en-us/library/windows/desktop/dd391569(v=vs.85).aspx
+                     via http://stackoverflow.com/questions/2820983/ -->
+                <ShortcutProperty
+                    Key="{9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}, 5"
+                    Value="SimonTatham.PuTTY" />
+              </Shortcut>
             </File>
           </Component>
           <Component Id="Pageant_Component"
@@ -292,7 +300,17 @@
                    Guid="$(var.Desktop_Shortcut_Component_GUID)">
           <Shortcut Id="DesktopPuTTY"
                     WorkingDirectory="INSTALLDIR" Target="[INSTALLDIR]putty.exe"
-                    Name="$(var.ProgramName)" Advertise="no" />
+                    Name="$(var.ProgramName)" Advertise="no">
+            <!-- Set AppUserModelId to match what PuTTY sets at
+                 runtime. I don't know if this does anything directly
+                 useful on the desktop version of the shortcut, but we
+                 might as well keep it consistent with the Start Menu
+                 version in case someone starts manually moving or
+                 copying shortcuts around. -->
+            <ShortcutProperty
+                Key="{9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}, 5"
+                Value="SimonTatham.PuTTY" />
+          </Shortcut>
           <RegistryValue Root="HKLM"
                          Key="$(var.RegKeyPathLocation)\DesktopEntry"
                          Type="string" Value="" KeyPath="yes" />
diff --git a/windows/putty.iss b/windows/putty.iss
index 5ecabb78..dda68f63 100644
--- a/windows/putty.iss
+++ b/windows/putty.iss
@@ -58,7 +58,7 @@ Source: "..\LICENCE"; DestDir: "{app}"; Flags: restartreplace uninsrestartdelete
 Source: "README.txt"; DestDir: "{app}"; Flags: isreadme restartreplace uninsrestartdelete
 
 [Icons]
-Name: "{group}\PuTTY"; Filename: "{app}\putty.exe"
+Name: "{group}\PuTTY"; Filename: "{app}\putty.exe"; AppUserModelID: "SimonTatham.PuTTY"
 ; We have to fall back from the .chm to the older .hlp file on some Windows
 ; versions.
 Name: "{group}\PuTTY Manual"; Filename: "{app}\putty.chm"; MinVersion: 4.1,5.0
@@ -67,8 +67,8 @@ Name: "{group}\PuTTY Web Site"; Filename: "{app}\website.url"
 Name: "{group}\PSFTP"; Filename: "{app}\psftp.exe"
 Name: "{group}\PuTTYgen"; Filename: "{app}\puttygen.exe"
 Name: "{group}\Pageant"; Filename: "{app}\pageant.exe"
-Name: "{commondesktop}\PuTTY"; Filename: "{app}\putty.exe"; Tasks: desktopicon\common
-Name: "{userdesktop}\PuTTY"; Filename: "{app}\putty.exe"; Tasks: desktopicon\user
+Name: "{commondesktop}\PuTTY"; Filename: "{app}\putty.exe"; Tasks: desktopicon\common; AppUserModelID: "SimonTatham.PuTTY"
+Name: "{userdesktop}\PuTTY"; Filename: "{app}\putty.exe"; Tasks: desktopicon\user; AppUserModelID: "SimonTatham.PuTTY"
 ; Putting this in {commonappdata} doesn't seem to work, on 98SE at least.
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\PuTTY"; Filename: "{app}\putty.exe"; Tasks: quicklaunchicon