diff --git a/package.json b/package.json
index 0b52d278f..b73f1a40d 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
   },
   "scripts": {
     "build": "grunt ; doctoc ./README.md ; doctoc ./doc/README.md ; doctoc ./doc/CHANGES.md",
-    "test": "grunt lint && karma start karma.conf.js"
+    "test": "grunt lint && karma start karma.conf.js",
+    "lint": "grunt lint"
   },
   "keywords": [
     "gridstack",
diff --git a/src/gridstack.js b/src/gridstack.js
index 71e2f9d45..f2fb18d1f 100644
--- a/src/gridstack.js
+++ b/src/gridstack.js
@@ -1033,9 +1033,13 @@
             return;
         }
         var height = this.grid.getGridHeight();
-        var minHeight = parseInt(this.container.css('min-height')) / this.cellHeight();
-        if (height < minHeight) {
-            height = minHeight;
+        // check for css min height. Each row is cellHeight + verticalMargin, until last one which has no margin below
+        var cssMinHeight = parseInt(this.container.css('min-height'));
+        if (cssMinHeight > 0) {
+            var minHeight = (cssMinHeight + this.opts.verticalMargin) / (this.cellHeight() + this.opts.verticalMargin);
+            if (height < minHeight) {
+                height = minHeight;
+            }
         }
         this.container.attr('data-gs-current-height', height);
         if (!this.opts.cellHeight) {