diff --git a/Gruntfile.js b/Gruntfile.js
index 7d8cdd4ba2..90be173ab4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -49,6 +49,7 @@ module.exports = function (grunt) {
         'client/lib/bull.js',
         'client/lib/marked.min.js',
         'client/lib/autobahn.js',
+        'client/lib/gridstack.all.js',
 
         'client/src/namespace.js',
         'client/src/exceptions.js',
diff --git a/application/Espo/Resources/metadata/app/client.json b/application/Espo/Resources/metadata/app/client.json
index adc0ba13f2..ef13ff5b46 100644
--- a/application/Espo/Resources/metadata/app/client.json
+++ b/application/Espo/Resources/metadata/app/client.json
@@ -21,6 +21,7 @@
         "client/lib/bull.js",
         "client/lib/marked.min.js",
         "client/lib/autobahn.js",
+        "client/lib/gridstack.all.js",
         "client/src/loader.js",
         "client/src/utils.js",
         "client/src/exceptions.js"
diff --git a/application/Espo/Resources/metadata/app/jsLibs.json b/application/Espo/Resources/metadata/app/jsLibs.json
index 6372f9e40b..4e7cc032d3 100644
--- a/application/Espo/Resources/metadata/app/jsLibs.json
+++ b/application/Espo/Resources/metadata/app/jsLibs.json
@@ -36,8 +36,8 @@
     },
     "gridstack": {
         "path": "client/lib/gridstack.all.js",
-        "exportsTo": "$",
-        "exportsAs": "gridstack"
+        "exportsTo": "window",
+        "exportsAs": "GridStack"
     },
     "Colorpicker": {
         "path": "client/lib/bootstrap-colorpicker.js",