diff --git a/src/panels/lovelace/badges/hui-state-label-badge.ts b/src/panels/lovelace/badges/hui-state-label-badge.ts
index 5ebea58d8b..25b7f3c8fa 100644
--- a/src/panels/lovelace/badges/hui-state-label-badge.ts
+++ b/src/panels/lovelace/badges/hui-state-label-badge.ts
@@ -49,7 +49,9 @@ export class HuiStateLabelBadge extends LitElement implements LovelaceBadge {
           hasDoubleClick: hasAction(this._config!.double_tap_action),
         })}
         tabindex=${ifDefined(
-          hasAction(this._config.tap_action) ? "0" : undefined
+          hasAction(this._config.tap_action) || this._config.entity
+            ? "0"
+            : undefined
         )}
       ></ha-state-label-badge>
     `;
diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.ts b/src/panels/lovelace/cards/hui-picture-entity-card.ts
index 8e47402538..187da7ec35 100644
--- a/src/panels/lovelace/cards/hui-picture-entity-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-entity-card.ts
@@ -158,7 +158,9 @@ class HuiPictureEntityCard extends LitElement implements LovelaceCard {
             hasDoubleClick: hasAction(this._config!.double_tap_action),
           })}
           tabindex=${ifDefined(
-            hasAction(this._config.tap_action) ? "0" : undefined
+            hasAction(this._config.tap_action) || this._config.entity
+              ? "0"
+              : undefined
           )}
           class=${classMap({
             clickable: stateObj.state !== UNAVAILABLE,
diff --git a/src/panels/lovelace/components/hui-generic-entity-row.ts b/src/panels/lovelace/components/hui-generic-entity-row.ts
index e0e61d4639..50fa3cb1ed 100644
--- a/src/panels/lovelace/components/hui-generic-entity-row.ts
+++ b/src/panels/lovelace/components/hui-generic-entity-row.ts
@@ -74,9 +74,7 @@ class HuiGenericEntityRow extends LitElement {
           hasHold: hasAction(this.config!.hold_action),
           hasDoubleClick: hasAction(this.config!.double_tap_action),
         })}
-        tabindex=${ifDefined(
-          hasAction(this.config.tap_action) ? "0" : undefined
-        )}
+        tabindex=${ifDefined(pointer ? "0" : undefined)}
       ></state-badge>
       <div class="flex">
         <div
diff --git a/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts b/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts
index ae0ac65dce..a87b48ae0c 100644
--- a/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts
@@ -91,9 +91,7 @@ class HuiInputSelectEntityRow extends LitElement implements LovelaceRow {
           hasHold: hasAction(this._config!.hold_action),
           hasDoubleClick: hasAction(this._config!.double_tap_action),
         })}
-        tabindex=${ifDefined(
-          hasAction(this._config.tap_action) ? "0" : undefined
-        )}
+        tabindex=${ifDefined(pointer ? "0" : undefined)}
       ></state-badge>
       <ha-paper-dropdown-menu
         .label=${this._config.name || computeStateName(stateObj)}