diff --git a/package.json b/package.json
index 3f8a9144..b20ac4b4 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "mattermost-desktop",
+  "name": "mattermost",
   "productName": "Mattermost",
   "version": "3.4.0",
   "description": "Mattermost Desktop application for Windows, Mac and Linux",
diff --git a/src/main.js b/src/main.js
index 08e4b462..bec6791e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,6 +30,7 @@ if (process.platform === 'win32') {
   }
 }
 
+app.setAppUserModelId('com.squirrel.mattermost.Mattermost'); // Use explicit AppUserModelID
 require('electron-squirrel-startup');
 
 const fs = require('fs');
diff --git a/src/package.json b/src/package.json
index f81f587d..07eea3f5 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "mattermost-desktop",
+  "name": "mattermost",
   "productName": "Mattermost",
   "desktopName": "Mattermost.desktop",
   "version": "3.4.0",