diff --git a/src/browser/index.jsx b/src/browser/index.jsx
index 90dbb85f..8084ae04 100644
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -174,6 +174,12 @@ var MattermostView = React.createClass({
 var configFile = remote.getGlobal('config-file');
 var config = settings.readFileSync(configFile);
 
+var contextMenu = require('./menus/context');
+var menu = contextMenu.createDefault();
+window.addEventListener('contextmenu', function(e) {
+  menu.popup(remote.getCurrentWindow());
+}, false);
+
 var showUnreadBadge = function(unreadCount) {
   switch (process.platform) {
     case 'win32':
diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index 32a21460..35eaac82 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -172,6 +172,12 @@ 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);
+
 ReactDOM.render(
   <SettingsPage configFile={ configFile } />,
   document.getElementById('content')