diff --git a/src/panels/lovelace/editor/card-editor/hui-edit-card.ts b/src/panels/lovelace/editor/card-editor/hui-edit-card.ts
index 068e96f723..bf2f7df114 100644
--- a/src/panels/lovelace/editor/card-editor/hui-edit-card.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-edit-card.ts
@@ -201,6 +201,7 @@ export class HuiEditCard extends LitElement {
       afterNextRender(() => {
         this.yamlEditor.codemirror.refresh();
         this._resizeDialog();
+        this.yamlEditor.codemirror.focus();
       });
     }
   }