diff --git a/app/view/settings/indicatoruimanager.cpp b/app/view/settings/indicatoruimanager.cpp
index 1ffcd132f..04fc7a36d 100644
--- a/app/view/settings/indicatoruimanager.cpp
+++ b/app/view/settings/indicatoruimanager.cpp
@@ -51,6 +51,7 @@ IndicatorUiManager::IndicatorUiManager(ViewPart::PrimaryConfigView *parent)
 
 IndicatorUiManager::~IndicatorUiManager()
 {
+    m_uidata.clear();
 }
 
 bool IndicatorUiManager::contains(const QString &type)
diff --git a/shell/package/contents/controls/CustomIndicatorButton.qml b/shell/package/contents/controls/CustomIndicatorButton.qml
index 9e5342e14..c8fda4ff7 100644
--- a/shell/package/contents/controls/CustomIndicatorButton.qml
+++ b/shell/package/contents/controls/CustomIndicatorButton.qml
@@ -55,7 +55,16 @@ LatteComponents.ComboBoxButton{
         target: latteView.indicator
         onCustomPluginsCountChanged: {
             custom.reloadModel();
-            custom.updateButtonInformation()
+            custom.updateButtonInformation();
+        }
+    }
+
+    Connections {
+        target: viewConfig
+        onIsReadyChanged: {
+            if (viewConfig.isReady) {
+                custom.updateButtonInformation();
+            }
         }
     }