diff --git a/css/grid.css b/css/grid.css
index f9c2c80e..c0439459 100644
--- a/css/grid.css
+++ b/css/grid.css
@@ -7,11 +7,6 @@
   line-height: auto;
 }
 
-.recline-grid-container {
-  overflow: auto;
-  height: 550px;
-}
-
 .recline-grid {
   border: 1px solid #ccc;
   width: 100%;
@@ -232,8 +227,8 @@ td.expression-preview-value {
   * Read-only mode
   *********************************************************/
 
-.recline-read-only .no-hidden .recline-grid tr td:first-child,
-.recline-read-only .no-hidden .recline-grid tr th:first-child
+.recline-read-only .recline-grid.no-hidden tr td:first-child,
+.recline-read-only .recline-grid.no-hidden tr th:first-child
 {
   display: none;
 }
diff --git a/src/view-grid.js b/src/view-grid.js
index 30e81a33..fc158723 100644
--- a/src/view-grid.js
+++ b/src/view-grid.js
@@ -193,7 +193,7 @@ my.Grid = Backbone.View.extend({
         });
       newView.render();
     });
-    this.el.toggleClass('no-hidden', (self.state.get('hiddenFields').length === 0));
+    this.el.find('.recline-grid').toggleClass('no-hidden', (self.state.get('hiddenFields').length === 0));
     return this;
   }
 });