diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml
index 8a0a7dc096..dd9a7b42a7 100644
--- a/resources/qml/Preferences/MachinesPage.qml
+++ b/resources/qml/Preferences/MachinesPage.qml
@@ -36,13 +36,27 @@ UM.ManagementPage
     renameEnabled: base.currentItem != null
     activateEnabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMachineId
 
-    Flow
+    Item
     {
-        anchors.fill: parent;
-        spacing: UM.Theme.getSize("default_margin").height;
+        visible: base.currentItem != null
+        anchors.fill: parent
+
+        Label
+        {
+            id: machineName
+            text: base.currentItem && base.currentItem.name ? base.currentItem.name : ""
+            font: UM.Theme.getFont("large")
+            width: parent.width
+            elide: Text.ElideRight
+        }
 
         Row
         {
+            id: machineActions
+            anchors.left: parent.left
+            anchors.top: machineName.bottom
+            anchors.topMargin: UM.Theme.getSize("default_margin").height
+
             Repeater
             {
                 id: machineActionRepeater
@@ -72,16 +86,18 @@ UM.ManagementPage
             }
         }
 
-        Label
+        Row
         {
-            text: base.currentItem && base.currentItem.name ? base.currentItem.name : ""
-            font: UM.Theme.getFont("large")
-            width: parent.width
-            elide: Text.ElideRight
-        }
+            anchors.top: machineActions.visible ? machineActions.bottom : machineActions.anchors.top
+            anchors.topMargin: UM.Theme.getSize("default_margin").height
+            anchors.left: parent.left
+            anchors.right: parent.right
 
-        Label { text: catalog.i18nc("@label", "Type"); width: parent.width * 0.2; }
-        Label { text: base.currentItem && base.currentItem.typeName ? base.currentItem.typeName : ""; width: parent.width * 0.7; }
+            spacing: UM.Theme.getSize("default_margin").height
+
+            Label { text: catalog.i18nc("@label", "Type") }
+            Label { text: base.currentItem ? base.currentItem.metadata.definition_name : "" }
+        }
 
         UM.I18nCatalog { id: catalog; name: "uranium"; }