diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 00e4fc9894..7ce3a938cf 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -813,3 +813,7 @@ class CuraApplication(QtApplication):
 
     def _addProfileWriter(self, profile_writer):
         pass
+
+    @pyqtSlot("QSize")
+    def setMinimumWindowSize(self, size):
+        self.getMainWindow().setMinimumSize(size)
diff --git a/cura/MachineManagerModel.py b/cura/MachineManagerModel.py
index 70953ee712..3466cd6428 100644
--- a/cura/MachineManagerModel.py
+++ b/cura/MachineManagerModel.py
@@ -286,7 +286,6 @@ class MachineManagerModel(QObject):
         self.setActiveQuality(new_container_id)
         self.updateQualityContainerFromUserContainer()
 
-
     @pyqtSlot(str, result=str)
     def duplicateContainer(self, container_id):
         if not self._active_container_stack:
@@ -357,7 +356,6 @@ class MachineManagerModel(QObject):
                 self.setActiveQuality(containers[0].getId())
                 self.activeQualityChanged.emit()
 
-
     @pyqtSlot()
     def updateQualityContainerFromUserContainer(self):
         if not self._active_container_stack:
@@ -496,6 +494,12 @@ class MachineManagerModel(QObject):
 
         return False
 
+    @pyqtSlot(str, result = str)
+    def getDefinitionByMachineId(self, machine_id):
+        containers = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id=machine_id)
+        if containers:
+            return containers[0].getBottom().getId()
+
     def _updateVariantContainer(self, definition):
         if not definition.getMetaDataEntry("has_variants"):
             return self._empty_variant_container
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 1d9ff48259..c1990d432e 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -17,6 +17,11 @@ UM.MainWindow
     title: catalog.i18nc("@title:window","Cura");
     viewportRect: Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0)
     property bool monitoringPrint: false
+    Component.onCompleted:
+    {
+        Printer.setMinimumWindowSize(UM.Theme.getSize("window_minimum_size"))
+    }
+
     Item
     {
         id: backgroundItem;
@@ -574,9 +579,6 @@ UM.MainWindow
         }
     }
 
-
-
-
     UM.PreferencesDialog
     {
         id: preferences
diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml
index dd9a7b42a7..e214034659 100644
--- a/resources/qml/Preferences/MachinesPage.qml
+++ b/resources/qml/Preferences/MachinesPage.qml
@@ -60,7 +60,7 @@ UM.ManagementPage
             Repeater
             {
                 id: machineActionRepeater
-                model: Cura.MachineActionManager.getSupportedActions(Cura.MachineManager.activeDefinitionId)
+                model: Cura.MachineActionManager.getSupportedActions(Cura.MachineManager.getDefinitionByMachineId(base.currentItem.id))
 
                 Button
                 {
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index 1b4b566d86..5bc5e99765 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -168,6 +168,7 @@
     },
 
     "sizes": {
+        "window_minimum_size": [70, 54],
         "window_margin": [1.0, 1.0],
         "default_margin": [1.0, 1.0],
         "default_lining": [0.08, 0.08],