diff --git a/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts b/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts
index cc5c9daaca..99a4022efc 100644
--- a/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts
+++ b/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts
@@ -342,6 +342,7 @@ export class HuiDialogEditView extends LitElement {
       css`
         h2 {
           display: block;
+          color: var(--primary-text-color);
           line-height: normal;
           -moz-osx-font-smoothing: grayscale;
           -webkit-font-smoothing: antialiased;
@@ -380,6 +381,7 @@ export class HuiDialogEditView extends LitElement {
         }
         paper-tabs {
           --paper-tabs-selection-bar-color: var(--primary-color);
+          color: var(--primary-text-color);
           text-transform: uppercase;
           border-bottom: 1px solid rgba(0, 0, 0, 0.1);
           padding: 0 20px;