diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-suggest-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-suggest-card.ts
index b478663aab..283cb9f4d3 100755
--- a/src/panels/lovelace/editor/card-editor/hui-dialog-suggest-card.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-dialog-suggest-card.ts
@@ -13,9 +13,7 @@ import deepFreeze from "deep-freeze";
 
 import { HomeAssistant } from "../../../../types";
 import { LovelaceCardConfig } from "../../../../data/lovelace";
-import "./hui-card-editor";
 import "./hui-card-preview";
-import "./hui-card-picker";
 import { addCards } from "../config-util";
 
 import "../../../../components/ha-yaml-editor";
diff --git a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
index b1c83867ab..c05fdbd133 100644
--- a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
@@ -78,6 +78,7 @@ export class HuiConditionalCardEditor extends LitElement
                     <hui-card-editor
                       .hass=${this.hass}
                       .value=${this._config.card}
+                      .lovelace=${this.lovelace}
                       @config-changed=${this._handleCardChanged}
                     ></hui-card-editor>
                   `