diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml
index 561c1f8f9d..c0a6d42b65 100644
--- a/resources/qml/Preferences/SettingVisibilityPage.qml
+++ b/resources/qml/Preferences/SettingVisibilityPage.qml
@@ -79,7 +79,13 @@ UM.PreferencesPage
                     }
 
                     // After change set "Custom" option
-                    visibilityPreset.currentIndex = visibilityPreset.model.count - 1
+
+                    // If already "Custom" then don't do nothing
+                    if (visibilityPreset.currentIndex != visibilityPreset.model.count - 1)
+                    {
+                        visibilityPreset.currentIndex = visibilityPreset.model.count - 1
+                        UM.Preferences.setValue("general/preset_setting_visibility_choice", visibilityPreset.model.get(visibilityPreset.currentIndex).text)
+                    }
                 }
             }
         }
@@ -260,6 +266,8 @@ UM.PreferencesPage
                     if (visibilityPreset.currentIndex != visibilityPreset.model.count - 1)
                     {
                         visibilityPreset.currentIndex = visibilityPreset.model.count - 1
+                        UM.Preferences.setValue("general/preset_setting_visibility_choice", visibilityPreset.model.get(visibilityPreset.currentIndex).text)
+
                     }
                 }
             }