diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index def2e228dd..9357526bdf 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -13,6 +13,7 @@ import computeObjectId from "../../../common/entity/compute_object_id";
 import computeStateDomain from "../../../common/entity/compute_state_domain";
 import { LocalizeFunc } from "../../../mixins/localize-base-mixin";
 import computeDomain from "../../../common/entity/compute_domain";
+import { EntityRowConfig, WeblinkConfig } from "../entity-rows/types";
 
 const DEFAULT_VIEW_ENTITY_ID = "group.default_view";
 const DOMAINS_BADGES = [
@@ -32,9 +33,9 @@ const computeCards = (
   const cards: LovelaceCardConfig[] = [];
 
   // For entity card
-  const entities: string[] = [];
+  const entities: Array<string | EntityRowConfig> = [];
 
-  for (const [entityId /*, stateObj */] of states) {
+  for (const [entityId, stateObj] of states) {
     const domain = computeDomain(entityId);
 
     if (domain === "alarm_control_panel") {
@@ -67,6 +68,16 @@ const computeCards = (
         type: "weather-forecast",
         entity: entityId,
       });
+    } else if (domain === "weblink") {
+      const conf: WeblinkConfig = {
+        type: "weblink",
+        url: stateObj.state,
+        name: computeStateName(stateObj),
+      };
+      if ("icon" in stateObj.attributes) {
+        conf.icon = stateObj.attributes.icon;
+      }
+      entities.push(conf);
     } else {
       entities.push(entityId);
     }
diff --git a/src/panels/lovelace/entity-rows/types.ts b/src/panels/lovelace/entity-rows/types.ts
index c73cf9ef50..48e9363a14 100644
--- a/src/panels/lovelace/entity-rows/types.ts
+++ b/src/panels/lovelace/entity-rows/types.ts
@@ -7,12 +7,15 @@ export interface EntityConfig {
   icon?: string;
 }
 export interface DividerConfig {
+  type: string;
   style: string;
 }
 export interface SectionConfig {
+  type: string;
   label: string;
 }
 export interface WeblinkConfig {
+  type: string;
   name?: string;
   icon?: string;
   url: string;
diff --git a/src/panels/lovelace/special-rows/hui-weblink-row.ts b/src/panels/lovelace/special-rows/hui-weblink-row.ts
index 2b42031240..c54beba2fb 100644
--- a/src/panels/lovelace/special-rows/hui-weblink-row.ts
+++ b/src/panels/lovelace/special-rows/hui-weblink-row.ts
@@ -35,7 +35,7 @@ class HuiWeblinkRow extends LitElement implements EntityRow {
 
     return html`
       ${this.renderStyle()}
-      <a href="${this._config.url}">
+      <a href="${this._config.url}" target="_blank">
         <ha-icon .icon="${this._config.icon}"></ha-icon>
         <div>${this._config.name}</div>
       </a>