diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
index 2dc4ba6326..2be716fd39 100644
--- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
@@ -58,5 +58,5 @@ Button {
     checkable: true
     checked: definition.expanded
 
-    onClicked: definition.expanded ? settingDefinitionsModel.collapse(definition.key) : settingDefinitionsModel.expandAll(definition.key)
+    onClicked: definition.expanded ? settingDefinitionsModel.collapse(definition.key) : settingDefinitionsModel.expandRecursive(definition.key)
 }
diff --git a/resources/qml/Settings/SettingCategory.qml b/resources/qml/Settings/SettingCategory.qml
index 3612c4cf29..419285d893 100644
--- a/resources/qml/Settings/SettingCategory.qml
+++ b/resources/qml/Settings/SettingCategory.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Ultimaker B.V.
+// Copyright (c) 2018 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.7
@@ -63,8 +63,6 @@ Button
 
     property var focusItem: base
 
-    //text: definition.label
-
     contentItem: Item {
         anchors.fill: parent
         anchors.left: parent.left
@@ -160,7 +158,7 @@ Button
         if (definition.expanded) {
             settingDefinitionsModel.collapse(definition.key);
         } else {
-            settingDefinitionsModel.expandAll(definition.key);
+            settingDefinitionsModel.expandRecursive(definition.key);
         }
         //Set focus so that tab navigation continues from this point on.
         //NB: This must be set AFTER collapsing/expanding the category so that the scroll position is correct.
@@ -237,7 +235,7 @@ Button
 
         onClicked:
         {
-            settingDefinitionsModel.expandAll(definition.key);
+            settingDefinitionsModel.expandRecursive(definition.key);
             base.checked = true;
             base.showAllHiddenInheritedSettings(definition.key);
         }