diff --git a/app/app.html b/app/app.html
index 937b4035c2..b3eebbd832 100644
--- a/app/app.html
+++ b/app/app.html
@@ -33,6 +33,11 @@
         }
       };
 
+      if (!data.exception) {
+        // Probably a regular console.error, etc
+        return data;
+      }
+
       data.exception.values[0].stacktrace.frames.forEach(function (frame) {
         frame.filename = normalize(frame.filename);
       });
@@ -57,28 +62,6 @@
   }());
 </script>
 
-<script>
-  // CREATE MENUS
-
-  const remote = require('electron').remote;
-  const Menu = remote.Menu;
-  const MenuItem = remote.MenuItem;
-
-  var menu = new Menu();
-  menu.append(new MenuItem({label: "Undo", selector: "undo:"}));
-  menu.append(new MenuItem({label: "Redo", selector: "redo:"}));
-  menu.append(new MenuItem({type: "separator"}));
-  menu.append(new MenuItem({label: "Cut", selector: "cut:"}));
-  menu.append(new MenuItem({label: "Copy", selector: "copy:"}));
-  menu.append(new MenuItem({label: "Paste", selector: "paste:"}));
-  menu.append(new MenuItem({label: "Select All", selector: "selectAll:"}));
-
-  window.addEventListener('contextmenu', function (e) {
-    e.preventDefault();
-    menu.popup(remote.getCurrentWindow());
-  }, false);
-</script>
-
 <script>
   // SOME HELPERS
 
diff --git a/app/app.js b/app/app.js
index 422f330c59..12e4615d4a 100644
--- a/app/app.js
+++ b/app/app.js
@@ -244,6 +244,8 @@ app.on('ready', () => {
     mainWindow = null;
   });
 
+  require('electron-context-menu')({});
+
   var template = [
     {
       label: "Application",
diff --git a/app/app.json b/app/app.json
index 43d4ae1463..0c9c493deb 100644
--- a/app/app.json
+++ b/app/app.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "insomnia",
-  "version": "3.2.5",
+  "version": "3.2.7",
   "productName": "Insomnia",
   "longName": "Insomnia HTTP Client",
   "description": "The best REST API Client",
@@ -10,6 +10,7 @@
   "main": "app.js",
   "dependencies": {
     "analytics-node": "^2.1.0",
+    "electron-context-menu": "^0.4.0",
     "electron-squirrel-startup": "^1.0.0",
     "httpsnippet": "git@github.com:gschier/httpsnippet.git#39d2fb0449f33711e5cc71a4d42b0e5b808426b4",
     "nedb": "^1.8.0",
diff --git a/package.json b/package.json
index d436dd59d4..0f96294959 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "hot-server": "babel-node ./webpack/server.js",
     "dev": "concurrently --kill-others \"npm run hot-server\" \"npm run start-hot\"",
     "build": "bash scripts/build.sh",
-    "package": "npm run package-win && npm run package-mac && npm run package-linux",
+    "package": "npm run package-mac && npm run package-win && npm run package-linux",
     "package-mac": "node node_modules/electron-builder/out/build-cli.js --publish=never --x64 --mac",
     "package-win": "node node_modules/electron-builder/out/build-cli.js --publish=never --x64 --win",
     "package-linux": "node node_modules/electron-builder/out/build-cli.js --publish=never --x64 --linux",
@@ -52,6 +52,7 @@
     "analytics-node": "^2.1.0",
     "classnames": "^2.2.3",
     "codemirror": "~5.16.0",
+    "electron-context-menu": "^0.4.0",
     "electron-squirrel-startup": "^1.0.0",
     "httpsnippet": "git@github.com:gschier/httpsnippet.git#39d2fb0449f33711e5cc71a4d42b0e5b808426b4",
     "json-lint": "^0.1.0",