diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
index 087c100f2c..77bc97256f 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
@@ -24,28 +24,6 @@ Item {
 
         spacing: UM.Theme.getSize("default_margin").height;
 
-        UM.SettingItem {
-            id: profileSelection
-
-            width: UM.Theme.getSize("setting").width;
-            height: UM.Theme.getSize("setting").height;
-
-            name: catalog.i18nc("@label", "Object profile")
-            type: "enum"
-            indent: false
-
-            style: UM.Theme.styles.setting_item;
-
-            options: UM.ProfilesModel { addUseGlobal: true }
-
-            value: UM.ActiveTool.properties.getValue("Model").getItem(base.currentIndex).profile
-
-            onItemValueChanged: {
-                var item = UM.ActiveTool.properties.getValue("Model").getItem(base.currentIndex);
-                UM.ActiveTool.properties.getValue("Model").setObjectProfile(item.id, value)
-            }
-        }
-
         Column {
             id: customisedSettings
             spacing: UM.Theme.getSize("default_lining").height;
diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py b/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py
index faca25d34f..0e415a1a96 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py
@@ -5,6 +5,7 @@ from UM.Tool import Tool
 from UM.Scene.Selection import Selection
 from UM.Application import Application
 from UM.Qt.ListModel import ListModel
+from UM.Preferences import Preferences
 
 from . import PerObjectSettingsModel
 
@@ -15,6 +16,8 @@ class PerObjectSettingsTool(Tool):
 
         self.setExposedProperties("Model", "SelectedIndex")
 
+        Preferences.getInstance().preferenceChanged.connect(self._onPreferenceChanged)
+
     def event(self, event):
         return False
 
@@ -35,4 +38,9 @@ class PerObjectSettingsTool(Tool):
             selected_object = None
         selected_object_id = id(selected_object)
         index = self.getModel().find("id", selected_object_id)
-        return index
\ No newline at end of file
+        return index
+
+    def _onPreferenceChanged(self, preference):
+        if preference == "cura/active_mode":
+            enabled = Preferences.getInstance().getValue(preference)==1
+            Application.getInstance().getController().toolEnabledChanged.emit(self._plugin_id, enabled)
\ No newline at end of file
diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index ff223cb38f..631445d987 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -33,7 +33,7 @@ Item {
 
                 checkable: true;
                 checked: model.active;
-                enabled: UM.Selection.hasSelection && UM.Controller.toolsEnabled;
+                enabled: model.enabled && UM.Selection.hasSelection && UM.Controller.toolsEnabled;
 
                 style: UM.Theme.styles.tool_button;
 
@@ -72,7 +72,7 @@ Item {
         }
         height: panel.item ? panel.height + 2 * UM.Theme.getSize("default_margin").height : 0;
 
-        opacity: panel.item ? 1 : 0
+        opacity: panel.item && panel.width > 0 ? 1 : 0
         Behavior on opacity { NumberAnimation { duration: 100 } }
 
         color: UM.Theme.getColor("lining");