diff --git a/cuttlefish/package/contents/ui/cuttlefish.qml b/cuttlefish/package/contents/ui/cuttlefish.qml
--- a/cuttlefish/package/contents/ui/cuttlefish.qml
+++ b/cuttlefish/package/contents/ui/cuttlefish.qml
@@ -19,7 +19,7 @@
  *                                                                         *
  ***************************************************************************/
 
-import QtQuick 2.1
+import QtQuick 2.5
 import QtQuick.Layouts 1.0
 
 import org.kde.plasma.core 2.0 as PlasmaCore
@@ -92,4 +92,9 @@
             }
         }
     }
+
+    Shortcut {
+        sequence: StandardKey.Quit
+        onActivated: Qt.quit()
+    }
 }
diff --git a/cuttlefish/src/main.cpp b/cuttlefish/src/main.cpp
--- a/cuttlefish/src/main.cpp
+++ b/cuttlefish/src/main.cpp
@@ -23,6 +23,7 @@
 #include <QCommandLineParser>
 #include <QCommandLineOption>
 #include <QDebug>
+#include <QQmlEngine>
 
 // Frameworks
 #include <KConfigGroup>
@@ -68,6 +69,8 @@
     QString _cc = parser.value(category);
 
     auto settingsapp = new CuttleFish::View(_cc, parser);
+    QObject::connect(settingsapp->engine(), &QQmlEngine::quit, &app, &QApplication::quit);
+
     if (parser.isSet(fullscreen)) {
         settingsapp->setVisibility(QWindow::FullScreen);
     }