diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccb4f081..45309506 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Release date: TBD
 ### Improvements
 
 #### All platforms
+- Use `electron-context-menu` to have a working and consistent context menu
 - Show current channel/team in window title
 - Changed display of unread messages on the team tabbar, they are now shown as bold text
 - Reload only the selected tab and keep its URL on "Reload" and "Clear Cache and Reload".
diff --git a/src/browser/index.jsx b/src/browser/index.jsx
index c7871cf9..a46cf2d0 100644
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -395,6 +395,10 @@ var MattermostView = React.createClass({
           }
         });
       }
+
+      require('electron-context-menu')({
+        window: webview
+      });
     });
 
     webview.addEventListener('ipc-message', function(event) {
@@ -509,12 +513,6 @@ if (config.teams.length === 0) {
   window.location = 'settings.html';
 }
 
-var contextMenu = require('./menus/context');
-var menu = contextMenu.createDefault();
-window.addEventListener('contextmenu', function(e) {
-  menu.popup(remote.getCurrentWindow());
-}, false);
-
 var showUnreadBadgeWindows = function(unreadCount, mentionCount) {
   const badge = require('./js/badge');
   const sendBadge = function(dataURL, description) {
diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index 62651296..bf10d1f2 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -480,11 +480,9 @@ var TeamListItemNew = React.createClass({
 
 var configFile = remote.getGlobal('config-file');
 
-var contextMenu = require('./menus/context');
-var menu = contextMenu.createDefault();
-window.addEventListener('contextmenu', function(e) {
-  menu.popup(remote.getCurrentWindow());
-}, false);
+require('electron-context-menu')({
+  window: remote.getCurrentWindow()
+});
 
 ReactDOM.render(
   <SettingsPage configFile={ configFile } />,
diff --git a/src/package.json b/src/package.json
index 215326b2..a12f7602 100644
--- a/src/package.json
+++ b/src/package.json
@@ -16,6 +16,7 @@
   "dependencies": {
     "auto-launch": "^2.1.0",
     "bootstrap": "^3.3.7",
+    "electron-context-menu": "^0.5.0",
     "electron-squirrel-startup": "^1.0.0",
     "os-locale": "^1.4.0",
     "react": "^15.3.0",