diff --git a/src/components/entity/ha-entity-state-content-picker.ts b/src/components/entity/ha-entity-state-content-picker.ts
index b83f490167..2ccc606668 100644
--- a/src/components/entity/ha-entity-state-content-picker.ts
+++ b/src/components/entity/ha-entity-state-content-picker.ts
@@ -178,7 +178,7 @@ class HaEntityStatePicker extends LitElement {
               no-style
               @item-moved=${this._moveItem}
               .disabled=${this.disabled}
-              filter="button.trailing.action"
+              handle-selector="[data-handle]"
             >
               <ha-chip-set>
                 ${repeat(
@@ -194,13 +194,9 @@ class HaEntityStatePicker extends LitElement {
                         @remove=${this._removeItem}
                         .label=${label}
                         selected
+                        data-handle
                       >
-                        <ha-svg-icon
-                          slot="icon"
-                          .path=${mdiDrag}
-                          data-handle
-                        ></ha-svg-icon>
-
+                        <ha-svg-icon slot="icon" .path=${mdiDrag}></ha-svg-icon>
                         ${label}
                       </ha-input-chip>
                     `;
diff --git a/src/components/ha-selector/ha-selector-select.ts b/src/components/ha-selector/ha-selector-select.ts
index b32c02c6fd..bb5fb989ef 100644
--- a/src/components/ha-selector/ha-selector-select.ts
+++ b/src/components/ha-selector/ha-selector-select.ts
@@ -156,6 +156,7 @@ export class HaSelectSelector extends LitElement {
                 no-style
                 .disabled=${!this.selector.select.reorder}
                 @item-moved=${this._itemMoved}
+                handle-selector="[data-handle]"
               >
                 <ha-chip-set>
                   ${repeat(
@@ -171,13 +172,13 @@ export class HaSelectSelector extends LitElement {
                           @remove=${this._removeItem}
                           .label=${label}
                           selected
+                          data-handle
                         >
                           ${this.selector.select?.reorder
                             ? html`
                                 <ha-svg-icon
                                   slot="icon"
                                   .path=${mdiDrag}
-                                  data-handle
                                 ></ha-svg-icon>
                               `
                             : nothing}