diff --git a/package-lock.json b/package-lock.json
index 020cc9cb2..6d7913ada 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32202,6 +32202,7 @@
         "@deephaven/components": "^0.85.0",
         "@deephaven/dashboard": "^0.85.0",
         "@deephaven/dashboard-core-plugins": "^0.85.0",
+        "@deephaven/golden-layout": "^0.85.0",
         "@deephaven/grid": "^0.85.0",
         "@deephaven/icons": "^0.85.0",
         "@deephaven/iris-grid": "^0.85.0",
@@ -32443,20 +32444,6 @@
         "react": ">=16.8.0"
       }
     },
-    "plugins/ui/src/js/node_modules/@deephaven/dashboard-core-plugins/node_modules/@deephaven/golden-layout": {
-      "version": "0.85.0",
-      "resolved": "https://registry.npmjs.org/@deephaven/golden-layout/-/golden-layout-0.85.0.tgz",
-      "integrity": "sha512-LM66CUKoHaAmZQinvQRFtvL2ZyYolqIb1WvTxf/qQeZDFCESVq3+Ns7aKk1AJxeSZqu3fD7t3YVD+f4uVzSdyQ==",
-      "dependencies": {
-        "@deephaven/components": "^0.85.0",
-        "jquery": "^3.6.0",
-        "nanoid": "^5.0.7"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
     "plugins/ui/src/js/node_modules/@deephaven/dashboard-core-plugins/node_modules/@deephaven/jsapi-types": {
       "version": "1.0.0-dev0.34.0",
       "resolved": "https://registry.npmjs.org/@deephaven/jsapi-types/-/jsapi-types-1.0.0-dev0.34.0.tgz",
@@ -32478,7 +32465,15 @@
         "react": ">=16.8.0"
       }
     },
-    "plugins/ui/src/js/node_modules/@deephaven/dashboard/node_modules/@deephaven/golden-layout": {
+    "plugins/ui/src/js/node_modules/@deephaven/filters": {
+      "version": "0.85.0",
+      "resolved": "https://registry.npmjs.org/@deephaven/filters/-/filters-0.85.0.tgz",
+      "integrity": "sha512-vwoNVJn/0U3xCESAgIJ8gXtOoym5LZ2XmMOkW37hNgCPp4lTk/SGE7StmaXzMQMZPGH6sLZWFGQ6ssIG2rbPng==",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "plugins/ui/src/js/node_modules/@deephaven/golden-layout": {
       "version": "0.85.0",
       "resolved": "https://registry.npmjs.org/@deephaven/golden-layout/-/golden-layout-0.85.0.tgz",
       "integrity": "sha512-LM66CUKoHaAmZQinvQRFtvL2ZyYolqIb1WvTxf/qQeZDFCESVq3+Ns7aKk1AJxeSZqu3fD7t3YVD+f4uVzSdyQ==",
@@ -32492,14 +32487,6 @@
         "react-dom": ">=16.8.0"
       }
     },
-    "plugins/ui/src/js/node_modules/@deephaven/filters": {
-      "version": "0.85.0",
-      "resolved": "https://registry.npmjs.org/@deephaven/filters/-/filters-0.85.0.tgz",
-      "integrity": "sha512-vwoNVJn/0U3xCESAgIJ8gXtOoym5LZ2XmMOkW37hNgCPp4lTk/SGE7StmaXzMQMZPGH6sLZWFGQ6ssIG2rbPng==",
-      "engines": {
-        "node": ">=16"
-      }
-    },
     "plugins/ui/src/js/node_modules/@deephaven/grid": {
       "version": "0.85.0",
       "resolved": "https://registry.npmjs.org/@deephaven/grid/-/grid-0.85.0.tgz",
@@ -32745,20 +32732,6 @@
         "react": ">=16.8.0"
       }
     },
-    "plugins/ui/src/js/node_modules/@deephaven/plugin/node_modules/@deephaven/golden-layout": {
-      "version": "0.85.0",
-      "resolved": "https://registry.npmjs.org/@deephaven/golden-layout/-/golden-layout-0.85.0.tgz",
-      "integrity": "sha512-LM66CUKoHaAmZQinvQRFtvL2ZyYolqIb1WvTxf/qQeZDFCESVq3+Ns7aKk1AJxeSZqu3fD7t3YVD+f4uVzSdyQ==",
-      "dependencies": {
-        "@deephaven/components": "^0.85.0",
-        "jquery": "^3.6.0",
-        "nanoid": "^5.0.7"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
     "plugins/ui/src/js/node_modules/@deephaven/plugin/node_modules/@deephaven/jsapi-types": {
       "version": "1.0.0-dev0.34.0",
       "resolved": "https://registry.npmjs.org/@deephaven/jsapi-types/-/jsapi-types-1.0.0-dev0.34.0.tgz",
@@ -36291,6 +36264,7 @@
         "@deephaven/components": "^0.85.0",
         "@deephaven/dashboard": "^0.85.0",
         "@deephaven/dashboard-core-plugins": "^0.85.0",
+        "@deephaven/golden-layout": "^0.85.0",
         "@deephaven/grid": "^0.85.0",
         "@deephaven/icons": "^0.85.0",
         "@deephaven/iris-grid": "^0.85.0",
@@ -36393,18 +36367,6 @@
             "lodash.throttle": "^4.1.1",
             "nanoid": "^5.0.7",
             "prop-types": "^15.7.2"
-          },
-          "dependencies": {
-            "@deephaven/golden-layout": {
-              "version": "0.85.0",
-              "resolved": "https://registry.npmjs.org/@deephaven/golden-layout/-/golden-layout-0.85.0.tgz",
-              "integrity": "sha512-LM66CUKoHaAmZQinvQRFtvL2ZyYolqIb1WvTxf/qQeZDFCESVq3+Ns7aKk1AJxeSZqu3fD7t3YVD+f4uVzSdyQ==",
-              "requires": {
-                "@deephaven/components": "^0.85.0",
-                "jquery": "^3.6.0",
-                "nanoid": "^5.0.7"
-              }
-            }
           }
         },
         "@deephaven/dashboard-core-plugins": {
@@ -36496,16 +36458,6 @@
                 "prop-types": "^15.7.2"
               }
             },
-            "@deephaven/golden-layout": {
-              "version": "0.85.0",
-              "resolved": "https://registry.npmjs.org/@deephaven/golden-layout/-/golden-layout-0.85.0.tgz",
-              "integrity": "sha512-LM66CUKoHaAmZQinvQRFtvL2ZyYolqIb1WvTxf/qQeZDFCESVq3+Ns7aKk1AJxeSZqu3fD7t3YVD+f4uVzSdyQ==",
-              "requires": {
-                "@deephaven/components": "^0.85.0",
-                "jquery": "^3.6.0",
-                "nanoid": "^5.0.7"
-              }
-            },
             "@deephaven/jsapi-types": {
               "version": "1.0.0-dev0.34.0",
               "resolved": "https://registry.npmjs.org/@deephaven/jsapi-types/-/jsapi-types-1.0.0-dev0.34.0.tgz",
@@ -36528,6 +36480,16 @@
           "resolved": "https://registry.npmjs.org/@deephaven/filters/-/filters-0.85.0.tgz",
           "integrity": "sha512-vwoNVJn/0U3xCESAgIJ8gXtOoym5LZ2XmMOkW37hNgCPp4lTk/SGE7StmaXzMQMZPGH6sLZWFGQ6ssIG2rbPng=="
         },
+        "@deephaven/golden-layout": {
+          "version": "0.85.0",
+          "resolved": "https://registry.npmjs.org/@deephaven/golden-layout/-/golden-layout-0.85.0.tgz",
+          "integrity": "sha512-LM66CUKoHaAmZQinvQRFtvL2ZyYolqIb1WvTxf/qQeZDFCESVq3+Ns7aKk1AJxeSZqu3fD7t3YVD+f4uVzSdyQ==",
+          "requires": {
+            "@deephaven/components": "^0.85.0",
+            "jquery": "^3.6.0",
+            "nanoid": "^5.0.7"
+          }
+        },
         "@deephaven/grid": {
           "version": "0.85.0",
           "resolved": "https://registry.npmjs.org/@deephaven/grid/-/grid-0.85.0.tgz",
@@ -36727,16 +36689,6 @@
             "@fortawesome/react-fontawesome": "^0.2.0"
           },
           "dependencies": {
-            "@deephaven/golden-layout": {
-              "version": "0.85.0",
-              "resolved": "https://registry.npmjs.org/@deephaven/golden-layout/-/golden-layout-0.85.0.tgz",
-              "integrity": "sha512-LM66CUKoHaAmZQinvQRFtvL2ZyYolqIb1WvTxf/qQeZDFCESVq3+Ns7aKk1AJxeSZqu3fD7t3YVD+f4uVzSdyQ==",
-              "requires": {
-                "@deephaven/components": "^0.85.0",
-                "jquery": "^3.6.0",
-                "nanoid": "^5.0.7"
-              }
-            },
             "@deephaven/jsapi-types": {
               "version": "1.0.0-dev0.34.0",
               "resolved": "https://registry.npmjs.org/@deephaven/jsapi-types/-/jsapi-types-1.0.0-dev0.34.0.tgz",
diff --git a/plugins/ui/src/js/package.json b/plugins/ui/src/js/package.json
index bce119b7e..3d5cf4120 100644
--- a/plugins/ui/src/js/package.json
+++ b/plugins/ui/src/js/package.json
@@ -45,6 +45,7 @@
     "@deephaven/components": "^0.85.0",
     "@deephaven/dashboard": "^0.85.0",
     "@deephaven/dashboard-core-plugins": "^0.85.0",
+    "@deephaven/golden-layout": "^0.85.0",
     "@deephaven/grid": "^0.85.0",
     "@deephaven/icons": "^0.85.0",
     "@deephaven/iris-grid": "^0.85.0",
diff --git a/plugins/ui/src/js/vite.config.ts b/plugins/ui/src/js/vite.config.ts
index 9a1abb16f..d04eed353 100644
--- a/plugins/ui/src/js/vite.config.ts
+++ b/plugins/ui/src/js/vite.config.ts
@@ -20,6 +20,7 @@ export default defineConfig(({ mode }) => ({
         '@deephaven/chart',
         '@deephaven/components',
         '@deephaven/dashboard',
+        '@deephaven/golden-layout',
         '@deephaven/icons',
         '@deephaven/iris-grid',
         '@deephaven/jsapi-bootstrap',