diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
index 87096c3a14..8ad512349b 100644
--- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
+++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
@@ -35,7 +35,7 @@ Item
         anchors.top: header.bottom
         anchors.topMargin: UM.Theme.getSize("default_margin").height
 
-        onCurrentIndexChanged: Cura.ExtruderManager.setActiveExtruderIndex(currentIndex)
+        currentIndex: Math.max(Cura.ExtruderManager.activeExtruderIndex, 0)
 
         Repeater
         {
@@ -53,6 +53,10 @@ Item
                         height: parent.height
                     }
                 }
+                onClicked:
+                {
+                    Cura.ExtruderManager.setActiveExtruderIndex(tabBar.currentIndex)
+                }
             }
         }
     }