diff --git a/electron/main.ts b/electron/main.ts
index c10a0162a..b5be97cf0 100644
--- a/electron/main.ts
+++ b/electron/main.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-useless-catch */
-import { app, BrowserWindow, Menu } from 'electron';
+import { app, BrowserWindow, globalShortcut, Menu } from 'electron';
 import * as path from 'path';
 import * as url from 'url';
 import { Api } from './api';
@@ -69,9 +69,21 @@ function createWindow(): BrowserWindow {
         }
     });
 
+    registerGlobalShortcuts();
     return win;
 }
 
+/**
+ * Registers common keyboard shortcuts
+ */
+function registerGlobalShortcuts() {
+    if (process.platform === 'darwin') {
+        globalShortcut.register('Command+Q', () => {
+            app.quit();
+        });
+    }
+}
+
 /**
  * Creates hidden window for EPG worker
  * Hidden window is used as an additional thread to avoid blocking of the UI by long operations