diff --git a/resources/qml/ActionPanel/OutputProcessWidget.qml b/resources/qml/ActionPanel/OutputProcessWidget.qml
index 3f53abf28f..ad5a708898 100644
--- a/resources/qml/ActionPanel/OutputProcessWidget.qml
+++ b/resources/qml/ActionPanel/OutputProcessWidget.qml
@@ -41,7 +41,7 @@ Column
             {
                 left: parent.left
                 right: printInformationPanel.left
-                rightMargin: UM.Theme.getSize("thin_margin").height
+                rightMargin: printInformationPanel.visible ? UM.Theme.getSize("thin_margin").width : 0
             }
 
             Cura.IconWithText
diff --git a/resources/qml/ActionPanel/PrintInformationWidget.qml b/resources/qml/ActionPanel/PrintInformationWidget.qml
index 0826e2c715..2e108b05d7 100644
--- a/resources/qml/ActionPanel/PrintInformationWidget.qml
+++ b/resources/qml/ActionPanel/PrintInformationWidget.qml
@@ -12,7 +12,7 @@ UM.RecolorImage
     id: widget
 
     source: UM.Theme.getIcon("info")
-    width: UM.Theme.getSize("section_icon").width
+    width: visible ? UM.Theme.getSize("section_icon").width : 0
     height: UM.Theme.getSize("section_icon").height
 
     color: UM.Theme.getColor("icon")
diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml
index 8f6957d9cd..eecf2a1e73 100644
--- a/resources/qml/MainWindow/MainWindowHeader.qml
+++ b/resources/qml/MainWindow/MainWindowHeader.qml
@@ -54,7 +54,7 @@ Item
             {
                 text: model.name.toUpperCase()
                 checkable: true
-                checked: UM.Controller.activeStage != null ? model.id == UM.Controller.activeStage.stageId : false
+                checked: UM.Controller.activeStage !== null && model.id == UM.Controller.activeStage.stageId
 
                 anchors.verticalCenter: parent.verticalCenter
                 exclusiveGroup: mainWindowHeaderMenuGroup