diff --git a/src/panels/lovelace/editor/card-editor/hui-card-picker.ts b/src/panels/lovelace/editor/card-editor/hui-card-picker.ts
index d127d17a47..d7a5d5f2c3 100644
--- a/src/panels/lovelace/editor/card-editor/hui-card-picker.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-card-picker.ts
@@ -155,12 +155,14 @@ export class HuiCardPicker extends LitElement {
height: this._height ? `${this._height}px` : "auto",
})}
>
-
- ${this._filter
- ? this._filterCards(this._cards, this._filter).map(
+ ${this._filter
+ ? html`
+ ${this._filterCards(this._cards, this._filter).map(
(cardElement: CardElement) => cardElement.element
- )
- : html`
+ )}
+
`
+ : html`
+
${suggestedCards.length > 0
? html`
+
${suggestedCards.length > 0
? html`
+
${customCardsItems.length > 0
? html`
+
+ `}
@@ -442,19 +449,20 @@ export class HuiCardPicker extends LitElement {
}
}
+ // prevent tabbing to card
+ if (element) {
+ element.tabIndex = -1;
+ }
+
return html`
-