diff --git a/src/main.js b/src/main.js
index 7296a9cf..128bb612 100644
--- a/src/main.js
+++ b/src/main.js
@@ -167,6 +167,9 @@ app.on('ready', function() {
     trayIcon.on('click', function() {
       mainWindow.focus();
     });
+    trayIcon.on('right-click', () => {
+      trayIcon.popUpContextMenu();
+    });
     trayIcon.on('balloon-click', function() {
       mainWindow.focus();
     });
diff --git a/src/main/menus/tray.js b/src/main/menus/tray.js
index 68eeaa4d..a537c408 100644
--- a/src/main/menus/tray.js
+++ b/src/main/menus/tray.js
@@ -8,7 +8,7 @@ const {
 
 function createDefault(mainWindow) {
   return Menu.buildFromTemplate([{
-    label: 'Open Mattermost',
+    label: `Open ${app.getName()}`,
     click: () => {
       mainWindow.show();
     }