diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts
index 365f39856f..1fc89bb235 100644
--- a/src/components/entity/ha-entity-picker.ts
+++ b/src/components/entity/ha-entity-picker.ts
@@ -215,6 +215,7 @@ export class HaEntityPicker extends LitElement {
                   slot="suffix"
                   class="clear-button"
                   icon="hass:close"
+                  tabindex="-1"
                   @click=${this._clearValue}
                   no-ripple
                 >
@@ -230,6 +231,7 @@ export class HaEntityPicker extends LitElement {
             slot="suffix"
             class="toggle-button"
             .icon=${this._opened ? "hass:menu-up" : "hass:menu-down"}
+            tabindex="-1"
           >
             Toggle
           </ha-icon-button>
diff --git a/src/components/ha-form/ha-form-string.ts b/src/components/ha-form/ha-form-string.ts
index 46bdbee332..3f62f9de31 100644
--- a/src/components/ha-form/ha-form-string.ts
+++ b/src/components/ha-form/ha-form-string.ts
@@ -55,6 +55,7 @@ export class HaFormString extends LitElement implements HaFormElement {
               id="iconButton"
               title="Click to toggle between masked and clear password"
               @click=${this._toggleUnmaskedPassword}
+              tabindex="-1"
             >
             </ha-icon-button>
           </paper-input>