diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 49c036f1ce..96b2f4b01c 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -367,6 +367,12 @@ class CuraApplication(QtApplication):
     def _onEngineCreated(self):
         self._engine.addImageProvider("camera", CameraImageProvider.CameraImageProvider())
 
+    ## The "Quit" button click event handler.
+    @pyqtSlot()
+    def closeApplication(self):
+        Logger.log("i", "Close application")
+        self._main_window.close()
+
     ## A reusable dialogbox
     #
     showMessageBox = pyqtSignal(str, str, str, str, int, int, arguments = ["title", "text", "informativeText", "detailedText", "buttons", "icon"])
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 2c76bb0914..3aaf63a2fd 100755
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -632,7 +632,7 @@ UM.MainWindow
     Connections
     {
         target: Cura.Actions.quit
-        onTriggered: base.visible = false;
+        onTriggered: CuraApplication.closeApplication();
     }
 
     Connections