diff --git a/etemplate/js/et2_dataview_view_container.js b/etemplate/js/et2_dataview_view_container.js
index da5b7c8c2a..56f5077c63 100644
--- a/etemplate/js/et2_dataview_view_container.js
+++ b/etemplate/js/et2_dataview_view_container.js
@@ -184,12 +184,10 @@ var et2_dataview_container = Class.extend(et2_dataview_IInvalidatable, {
 			// Increment the height value for each visible container node
 			var self = this;
 			$j(this._nodes, ":visible").each(function() {
-				height += self._nodeHeight(this);
+				height += self._nodeHeight(this[0]);
 			});
 		}
 
-		console.log(height);
-
 		return height;
 	},
 
@@ -237,7 +235,7 @@ else
 {
 	et2_dataview_container.prototype._nodeHeight = function(_node)
 	{
-		return $j(_node).outerHeight(true);
+		return _node.offsetHeight;
 	}
 }
 
diff --git a/etemplate/js/et2_dataview_view_grid.js b/etemplate/js/et2_dataview_view_grid.js
index 6ed1e1a7ba..a7ec6ef1be 100644
--- a/etemplate/js/et2_dataview_view_grid.js
+++ b/etemplate/js/et2_dataview_view_grid.js
@@ -20,6 +20,16 @@
 	et2_dataview_view_partitionTree;
 */
 
+/**
+ * Determines how many pixels the view range of the gridview is extended.
+ */
+var ET2_GRID_VIEW_EXT = 25;
+
+/**
+ * Determines the timeout after which the scroll-event is processed.
+ */
+var ET2_GRID_SCROLL_TIMEOUT = 25;
+
 var et2_dataview_grid = Class.extend(et2_dataview_IViewRange, {
 
 	/**
@@ -226,10 +236,10 @@ var et2_dataview_grid = Class.extend(et2_dataview_IViewRange, {
 						// function
 						e.data._scrollTimeout = window.setTimeout(function() {
 							e.data.setViewRange(et2_range(
-								e.data.scrollarea.scrollTop(),
-								e.data._height
+								e.data.scrollarea.scrollTop() - ET2_GRID_VIEW_EXT,
+								e.data._height + ET2_GRID_VIEW_EXT * 2
 							));
-						}, 25);
+						}, ET2_GRID_SCROLL_TIMEOUT);
 					})
 				.height(this._scrollHeight)
 				.appendTo(this.outerCell);
diff --git a/etemplate/js/et2_dataview_view_gridcontainer.js b/etemplate/js/et2_dataview_view_gridcontainer.js
index fcd10a5ab5..c1244e7e62 100644
--- a/etemplate/js/et2_dataview_view_gridcontainer.js
+++ b/etemplate/js/et2_dataview_view_gridcontainer.js
@@ -127,7 +127,6 @@ var et2_dataview_gridContainer = Class.extend({
 
 			// Rebuild the column stylesheets
 			this.columnMgr.setTotalWidth(_w - this.scrollbarWidth);
-			et2_debug("log", _w - this.scrollbarWidth);
 			this._updateColumns();
 		}