diff --git a/src/panels/lovelace/editor/hui-entities-card-row-editor.ts b/src/panels/lovelace/editor/hui-entities-card-row-editor.ts
index 04a3a50a07..6f492d23e4 100644
--- a/src/panels/lovelace/editor/hui-entities-card-row-editor.ts
+++ b/src/panels/lovelace/editor/hui-entities-card-row-editor.ts
@@ -74,7 +74,9 @@ export class HuiEntitiesCardRowEditor extends LitElement {
             : this.entities!.map(
                 (entityConf, index) => html`
                   <div class="entity">
-                    <ha-svg-icon class="handle" .path=${mdiDrag}></ha-svg-icon>
+                    <div class="handle">
+                      <ha-svg-icon .path=${mdiDrag}></ha-svg-icon>
+                    </div>
                     ${entityConf.type
                       ? html`
                           <div class="special-row">
@@ -277,6 +279,9 @@ export class HuiEntitiesCardRowEditor extends LitElement {
           padding-inline-start: initial;
           direction: var(--direction);
         }
+        .entity .handle > * {
+          pointer-events: none;
+        }
 
         .entity ha-entity-picker {
           flex-grow: 1;