diff --git a/packages/builder/src/stores/builder/components.ts b/packages/builder/src/stores/builder/components.ts
index f1a4916973..a30cdaaf59 100644
--- a/packages/builder/src/stores/builder/components.ts
+++ b/packages/builder/src/stores/builder/components.ts
@@ -716,15 +716,16 @@ export class ComponentStore extends BudiStore<ComponentState> {
    *
    * @param {string} componentId
    */
-  select(componentId: string) {
-    builderStore.update(state => {
-      state.highlightedSetting = null
-      return state
-    })
-
+  select(id: string) {
     this.update(state => {
-      state.selectedComponentId = componentId
-      return state
+      // Only clear highlights if selecting a different component
+      if (!id.includes(state.selectedComponentId!)) {
+        builderStore.highlightSetting()
+      }
+      return {
+        ...state,
+        selectedComponentId: id,
+      }
     })
   }