diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts
index ff43fa59dc..0a8d86fee4 100644
--- a/src/components/data-table/ha-data-table.ts
+++ b/src/components/data-table/ha-data-table.ts
@@ -117,6 +117,14 @@ export class HaDataTable extends LitElement {
     this._checkedRowsChanged();
   }
 
+  public connectedCallback() {
+    super.connectedCallback();
+    if (this._filteredData.length) {
+      // Force update of location of rows
+      this._filteredData = [...this._filteredData];
+    }
+  }
+
   protected firstUpdated(properties: PropertyValues) {
     super.firstUpdated(properties);
     this._worker = sortFilterWorker();
diff --git a/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts b/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts
index f65e118b5e..474444c4c7 100644
--- a/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts
+++ b/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts
@@ -197,6 +197,7 @@ export class HaConfigLovelaceDashboards extends LitElement {
       },
       ...dashboards.map((dashboard) => {
         return {
+          filename: "",
           ...dashboard,
           default: localStorage.defaultPage === dashboard.url_path,
         };