diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml
index c103ee245c..8f312adb85 100644
--- a/resources/qml/ExtruderIcon.qml
+++ b/resources/qml/ExtruderIcon.qml
@@ -16,6 +16,7 @@ Item
     property color materialColor
     property alias textColor: extruderNumberText.color
     property bool extruderEnabled: true
+
     UM.RecolorImage
     {
         id: mainIcon
diff --git a/resources/qml/MachineSelector.qml b/resources/qml/MachineSelector.qml
index a6339e2621..14e1ebb48e 100644
--- a/resources/qml/MachineSelector.qml
+++ b/resources/qml/MachineSelector.qml
@@ -184,7 +184,11 @@ Cura.ExpandableComponent
                 hoverColor: UM.Theme.getColor("secondary")
                 textColor: UM.Theme.getColor("primary")
                 textHoverColor: UM.Theme.getColor("text")
-                onClicked: Cura.Actions.addMachine.trigger()
+                onClicked:
+                {
+                    togglePopup()
+                    Cura.Actions.addMachine.trigger()
+                }
             }
 
             Cura.ActionButton
@@ -196,7 +200,11 @@ Cura.ExpandableComponent
                 hoverColor: UM.Theme.getColor("secondary")
                 textColor: UM.Theme.getColor("primary")
                 textHoverColor: UM.Theme.getColor("text")
-                onClicked: Cura.Actions.configureMachines.trigger()
+                onClicked:
+                {
+                    togglePopup()
+                    Cura.Actions.configureMachines.trigger()
+                }
             }
         }
     }