diff --git a/build-scripts/webpack.js b/build-scripts/webpack.js
index 65d4287a34..e2be2fc8ca 100644
--- a/build-scripts/webpack.js
+++ b/build-scripts/webpack.js
@@ -35,6 +35,9 @@ const createWebpackConfig = ({
             loader: "babel-loader",
             options: bundle.babelOptions({ latestBuild }),
           },
+          resolve: {
+            fullySpecified: false,
+          },
         },
         {
           test: /\.css$/,
diff --git a/package.json b/package.json
index df64438afc..408d9fa965 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "leaflet": "^1.4.0",
     "leaflet-draw": "^1.0.4",
     "lit-element": "^2.4.0",
-    "lit-grid-layout": "^1.1.10",
+    "lit-grid-layout": "^1.1.11",
     "lit-html": "^1.3.0",
     "lit-virtualizer": "^0.4.2",
     "marked": "^1.1.1",
diff --git a/src/panels/lovelace/views/hui-grid-view.ts b/src/panels/lovelace/views/hui-grid-view.ts
index e09a88d151..25796fba59 100644
--- a/src/panels/lovelace/views/hui-grid-view.ts
+++ b/src/panels/lovelace/views/hui-grid-view.ts
@@ -207,8 +207,6 @@ export class GridView extends LitElement implements LovelaceViewElement {
       return;
     }
 
-    const cards = {};
-
     const newLayout: Array<{
       width: number;
       height: number;
@@ -261,22 +259,9 @@ export class GridView extends LitElement implements LovelaceViewElement {
         ...cardConfig.layout,
       };
 
-      cards[layout.key] = { card, index };
-
       newLayout.push(layout);
     }
 
-    // const cards = this._config!.cards!.map((conf, idx) => {
-    //   return { ...conf, layout: newLayout[idx] };
-    // });
-
-    // this.lovelace?.saveConfig(
-    //   replaceView(this.lovelace.config, this.index!, {
-    //     ...this._config!,
-    //     cards,
-    //   })
-    // );
-
     this._layout = newLayout;
     this._createCards();
   }
diff --git a/yarn.lock b/yarn.lock
index 21b69b7a28..79ef6c68fa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8601,25 +8601,25 @@ lit-analyzer@1.2.1, lit-analyzer@^1.2.1:
     vscode-html-languageservice "3.1.0"
     web-component-analyzer "~1.1.1"
 
-lit-element@2.3.1, lit-element@^2.0.0, lit-element@^2.2.1, lit-element@^2.3.0, lit-element@^2.3.1, lit-element@^2.4.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.3.1.tgz#73343b978fa1e73d60526c6bb6ad60f53a16c343"
-  integrity sha512-tOcUAmeO3BzwiQ7FGWdsshNvC0HVHcTFYw/TLIImmKwXYoV0E7zCBASa8IJ7DiP4cen/Yoj454gS0qqTnIGsFA==
+lit-element@2.4.0, lit-element@^2.0.0, lit-element@^2.2.1, lit-element@^2.3.0, lit-element@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.4.0.tgz#b22607a037a8fc08f5a80736dddf7f3f5d401452"
+  integrity sha512-pBGLglxyhq/Prk2H91nA0KByq/hx/wssJBQFiYqXhGDvEnY31PRGYf1RglVzyLeRysu0IHm2K0P196uLLWmwFg==
   dependencies:
     lit-html "^1.1.1"
 
-lit-grid-layout@^1.1.10:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/lit-grid-layout/-/lit-grid-layout-1.1.10.tgz#784b9848fd342fea9626a3253e15351b719c9111"
-  integrity sha512-MIDpym8h5pyZwWt/Eg2djZqVajXtzY0g0BQcUr28CypYqlU6TihlaFeucEZU/042TSdDZSjsHz0+n/7EGZv+Gg==
+lit-grid-layout@^1.1.11:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/lit-grid-layout/-/lit-grid-layout-1.1.11.tgz#0eb160ac61fcd25fd1929963776ff5d2df051320"
+  integrity sha512-NSI7QuLllKvjrQEYdAFOv8Ucznu3TWDtxxroyDcv8Qv/zsjkuAJDK/bQjjuDSw/x7yy3NVn/c1I864fSUb47Rw==
   dependencies:
     lit-element "^2.4.0"
     lit-html "^1.3.0"
 
-lit-html@1.2.1, lit-html@^1.0.0, lit-html@^1.1.1, lit-html@^1.1.2, lit-html@^1.2.1, lit-html@^1.3.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.2.1.tgz#1fb933dc1e2ddc095f60b8086277d4fcd9d62cc8"
-  integrity sha512-GSJHHXMGLZDzTRq59IUfL9FCdAlGfqNp/dEa7k7aBaaWD+JKaCjsAk9KYm2V12ItonVaYx2dprN66Zdm1AuBTQ==
+lit-html@1.3.0, lit-html@^1.0.0, lit-html@^1.1.1, lit-html@^1.1.2, lit-html@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.3.0.tgz#c80f3cc5793a6dea6c07172be90a70ab20e56034"
+  integrity sha512-0Q1bwmaFH9O14vycPHw8C/IeHMk/uSDldVLIefu/kfbTBGIc44KGH6A8p1bDfxUfHdc8q6Ct7kQklWoHgr4t1Q==
 
 lit-virtualizer@^0.4.2:
   version "0.4.2"
@@ -12586,16 +12586,16 @@ uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
+uuid@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 uuid@^8.3.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
   integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
 
-v8-compile-cache@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
-  integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==
-
 v8-compile-cache@^2.0.3:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"