diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
index bb342d5045..6390f29bf4 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
@@ -45,6 +45,7 @@ Item
                 break
             }
         }
+        visibility_handler.addSkipResetSetting(currentMeshType)
     }
 
     function setOverhangsMeshType()
@@ -203,6 +204,7 @@ Item
 
                         visibilityHandler: Cura.PerObjectSettingVisibilityHandler
                         {
+                            id: visibility_handler
                             selectedObjectId: UM.ActiveTool.properties.getValue("SelectedObjectId")
                         }
 
diff --git a/plugins/PerObjectSettingsTool/SettingPickDialog.qml b/plugins/PerObjectSettingsTool/SettingPickDialog.qml
index 92e22f26bc..812a941e8d 100644
--- a/plugins/PerObjectSettingsTool/SettingPickDialog.qml
+++ b/plugins/PerObjectSettingsTool/SettingPickDialog.qml
@@ -20,10 +20,7 @@ UM.Dialog
             // force updating the model to sync it with addedSettingsModel
             if (visible)
             {
-                // Set skip setting, it will prevent from resetting selected mesh_type
-                contents.model.visibilityHandler.addSkipResetSetting(currentMeshType)
                 listview.model.forceUpdate()
-
                 updateFilter()
             }
         }