diff --git a/src/mainapplication.cpp b/src/mainapplication.cpp
index 4abceb694d5b1b8251007436ce05b09db82bd0ef..f0d004770af14be7803ee10ddd0579f19ce2ba78 100644
--- a/src/mainapplication.cpp
+++ b/src/mainapplication.cpp
@@ -479,11 +479,16 @@ MainApplication::initSystray()
 
     QMenu* systrayMenu = new QMenu();
 
-    QAction* exitAction = new QAction(tr("Exit"), this);
-    connect(exitAction, &QAction::triggered, [this] {
-        engine_->quit();
-        cleanup();
-    });
+    QString quitString;
+#ifdef Q_OS_WINDOWS
+    quitString = tr("E&xit");
+#else
+    quitString = tr("&Quit");
+#endif
+
+    QAction* quitAction = new QAction(quitString, this);
+    connect(quitAction, &QAction::triggered, this, &MainApplication::cleanup);
+
     connect(systemTray_.get(),
             &QSystemTrayIcon::activated,
             [this](QSystemTrayIcon::ActivationReason reason) {
@@ -491,7 +496,7 @@ MainApplication::initSystray()
                     restoreApp();
             });
 
-    systrayMenu->addAction(exitAction);
+    systrayMenu->addAction(quitAction);
     systemTray_->setContextMenu(systrayMenu);
     systemTray_->show();
 }
diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index c5e7d1577d4174042f15478d4b82848caa4d0013..344853d6c080b4c74424bbbed0735505bba0d646 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -612,6 +612,12 @@ Rectangle {
         }
     }
 
+    Shortcut {
+        sequence: StandardKey.Quit
+        context: Qt.ApplicationShortcut
+        onActivated: Qt.quit()
+    }
+
     KeyBoardShortcutTable {
         id: shortcutsTable
     }
diff --git a/src/settingsview/components/KeyBoardShortcutTable.qml b/src/settingsview/components/KeyBoardShortcutTable.qml
index cbdc1ae9b52eef4d8f6b5f358f066dfa210c63a9..b5843cf6f580d6d7bba390c794e454a0a86f6835 100644
--- a/src/settingsview/components/KeyBoardShortcutTable.qml
+++ b/src/settingsview/components/KeyBoardShortcutTable.qml
@@ -77,6 +77,12 @@ BaseDialog {
                 Description: qsTr("Fullscreen")
                 KeyLength: 1
             }
+            // TODO: add the following after redesign
+            // ListElement {
+            //     Shortcut: Qt.platform.os !== "windows" ? "Ctrl+Q" : "Alt+F4"
+            //     Description: Qt.platform.os !== "windows" ? qsTr("Quit") : qsTr("Exit")
+            //     KeyLength: 2
+            // }
         }
         ListModel {
             id: keyboardConversationShortcutsModel