diff --git a/desktop/package.json b/desktop/package.json
index 3e56d2a0..f00202f1 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -33,6 +33,7 @@
   "dependencies": {
     "electron-log": "^4.4.6",
     "electron-squirrel-startup": "^1.0.0",
+    "electron-unhandled": "^4.0.0",
     "electron-update-notifier": "^1.5.3",
     "electron-window-state": "^5.0.3",
     "update-electron-app": "^2.0.1"
diff --git a/desktop/src/main/index.ts b/desktop/src/main/index.ts
index 71e53c8d..99efcb29 100644
--- a/desktop/src/main/index.ts
+++ b/desktop/src/main/index.ts
@@ -1,9 +1,12 @@
 import { app, BrowserWindow } from 'electron';
 import windowStateKeeper from 'electron-window-state';
 import { config } from './config';
+import unhandled from 'electron-unhandled';
 import './update';
 import './menu';
 
+unhandled();
+
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.
 if (require('electron-squirrel-startup')) {
   // eslint-disable-line global-require
diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index 0dc54453..cf2e14d5 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -740,7 +740,7 @@ chromium-pickle-js@^0.2.0:
   resolved "https://registry.npmmirror.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
   integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=
 
-clean-stack@^2.0.0:
+clean-stack@^2.0.0, clean-stack@^2.1.0:
   version "2.2.0"
   resolved "https://registry.npmmirror.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
@@ -1086,6 +1086,11 @@ electron-is-dev@^0.3.0:
   resolved "https://registry.npmmirror.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe"
   integrity sha512-jLttuuq8QK67n3mXmIe9pkrO7IH3LGIk12xJkhTmc852U2sCJaRAOpRGPSh+1Xnzck5v9escd9YXzuze9nGejg==
 
+electron-is-dev@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/electron-is-dev/-/electron-is-dev-2.0.0.tgz#833487a069b8dad21425c67a19847d9064ab19bd"
+  integrity sha512-3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA==
+
 electron-log@^4.4.6:
   version "4.4.6"
   resolved "https://registry.npmmirror.com/electron-log/-/electron-log-4.4.6.tgz#e7824fc725370384f6edaaac0480c423e570dc69"
@@ -1162,6 +1167,16 @@ electron-squirrel-startup@^1.0.0:
   dependencies:
     debug "^2.2.0"
 
+electron-unhandled@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmmirror.com/electron-unhandled/-/electron-unhandled-4.0.0.tgz#875c6d468062bc45055abbfcb71ddaa9c5e90ad5"
+  integrity sha512-Vm0xyfJ06PUXktjN2fO2XdWwalAkuPVsVp/gW+30g5398XXt0blM9eg6tL+5kWBST5YZ1lC4bUvY3fwX4xbx1g==
+  dependencies:
+    clean-stack "^2.1.0"
+    electron-is-dev "^2.0.0"
+    ensure-error "^2.0.0"
+    lodash.debounce "^4.0.8"
+
 electron-update-notifier@^1.5.3:
   version "1.5.3"
   resolved "https://registry.npmmirror.com/electron-update-notifier/-/electron-update-notifier-1.5.3.tgz#23c4e6f255e2b8a8cc24061c742c180e2fd5fe99"
@@ -1223,6 +1238,11 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
+ensure-error@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/ensure-error/-/ensure-error-2.1.0.tgz#f11fbe383c0cf4a54850ac77acceb7bc06e0f99d"
+  integrity sha512-+BMSJHw9gxiJAAp2ZR1E0TNcL09dD3lOvkl7WVm4+Y6xnes/pMetP/TzCHiDduh8ihNDjbGfuYxl7l4PA1xZ8A==
+
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.npmmirror.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
@@ -2087,6 +2107,11 @@ lodash._reinterpolate@^3.0.0:
   resolved "https://registry.npmmirror.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
+
 lodash.get@^4.0.0:
   version "4.4.2"
   resolved "https://registry.npmmirror.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"