diff --git a/app/index.js b/app/index.js
index d0fb8988ee2..d4435a7f2ed 100644
--- a/app/index.js
+++ b/app/index.js
@@ -195,6 +195,13 @@ const initiateSessionStateSave = () => {
   })
 }
 
+// exit cleanly on signals
+['SIGTERM', 'SIGHUP', 'SIGINT', 'SIGBREAK'].forEach((signal) => {
+  process.on(signal, () => {
+    app.quit()
+  })
+})
+
 let loadAppStatePromise = SessionStore.loadAppState()
 
 // Some settings must be set right away on startup, those settings should be handled here.