diff --git a/cura/Machines/Models/MachineListModel.py b/cura/Machines/Models/MachineListModel.py
index 74ef7ae7b4..69a3c53d03 100644
--- a/cura/Machines/Models/MachineListModel.py
+++ b/cura/Machines/Models/MachineListModel.py
@@ -110,22 +110,22 @@ class MachineListModel(ListModel):
 
         for abstract_machine in abstract_machine_stacks:
             definition_id = abstract_machine.definition.getId()
-            online_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = True)
+            connected_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = False)
 
-            online_machine_stacks = list(filter(lambda machine: machine.hasNetworkedConnection(), online_machine_stacks))
-            online_machine_stacks.sort(key=lambda machine: machine.getName().upper())
+            connected_machine_stacks = list(filter(lambda machine: machine.hasNetworkedConnection(), connected_machine_stacks))
+            connected_machine_stacks.sort(key=lambda machine: machine.getName().upper())
 
             if abstract_machine in other_machine_stacks:
                 other_machine_stacks.remove(abstract_machine)
 
-            if abstract_machine in online_machine_stacks:
-                online_machine_stacks.remove(abstract_machine)
+            if abstract_machine in connected_machine_stacks:
+                connected_machine_stacks.remove(abstract_machine)
 
             # Create a list item for abstract machine
-            self.addItem(abstract_machine, True, len(online_machine_stacks))
+            self.addItem(abstract_machine, True, len(connected_machine_stacks))
 
             # Create list of machines that are children of the abstract machine
-            for stack in online_machine_stacks:
+            for stack in connected_machine_stacks:
                 if self._show_cloud_printers:
                     self.addItem(stack, True)
                 # Remove this machine from the other stack list
diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml
index 97ba2303e9..8028b89e02 100644
--- a/plugins/Marketplace/resources/qml/Marketplace.qml
+++ b/plugins/Marketplace/resources/qml/Marketplace.qml
@@ -280,7 +280,7 @@ Window
                 onClicked:
                 {
                     marketplaceDialog.hide();
-                    CuraApplication.closeApplication();
+                    CuraApplication.checkAndExitApplication();
                 }
             }
         }