diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index fe1b35767ed0e084ce82a8edc897105d52a624c9..4396a576cc2788c41b66175470b9b3de9b255b19 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -337,6 +337,10 @@ WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info\DefaultIcon" "" '"$INSTDIR\$
 # URL param must be last item passed to viewer, it ignores subsequent params to avoid parameter injection attacks.
 WriteRegExpandStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open\command" "" '"$INSTDIR\$INSTEXE" -url "%1"'
 
+# Only allow Launcher to be the icon
+WriteRegStr HKEY_CLASSES_ROOT "Applications" "$INSTEXE" "IsHostApp"
+WriteRegStr HKEY_CLASSES_ROOT "Applications" "$VIEWER_EXE" "NoStartPage"
+
 # Write out uninstaller
 WriteUninstaller "$INSTDIR\uninst.exe"
 
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index bac80d8c13aeb7634bb16357649f04e59e66e21e..78dc830c1bb4ea36cf5ad3f69f04c9cc6190e0d8 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -654,6 +654,7 @@ def package_finish(self):
             'version' : '.'.join(self.args['version']),
             'version_short' : '.'.join(self.args['version'][:-1]),
             'version_dashes' : '-'.join(self.args['version']),
+            'viewer_exe' : self.channel_with_pkg_suffix().replace(' ', '')+'.exe',
             'final_exe' : self.final_exe(),
             'flags':'',
             'app_name':self.app_name(),
@@ -668,6 +669,7 @@ def package_finish(self):
         !define VERSION "%(version_short)s"
         !define VERSION_LONG "%(version)s"
         !define VERSION_DASHES "%(version_dashes)s"
+        !define VIEWER_EXE "%(viewer_exe)%s"
         """ % substitution_strings
         
         if self.channel_type() == 'release':