Index: branches/RC/core/admin_templates/js/grid_scroller.js
===================================================================
diff -u -N -r10867 -r10885
--- branches/RC/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 10867)
+++ branches/RC/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 10885)
@@ -196,10 +196,6 @@
 	h -= this.pos[1] + dim.padding[0] + dim.padding[2] + dim.borders[0] + dim.borders[2] + this.BottomOffset;
 	var $html = this.AltHTML(this.pos[0],this.pos[1], w, h);
 
-	if (typeof($container) !== 'undefined') {
-		$html = this._getMeasureHtml() + $html;
-	}
-
 	return $html;
 }
 
@@ -230,7 +226,8 @@
 			this.Html = this._prepareHtml(id);
 
 			var collapse_correction = this._getCollapseCorrection();
-			document.getElementById(id).innerHTML = '<div id="main_div_'+this.GridId+'" style="margin-left: '+collapse_correction+'px">'+this.Html+'</div>';
+
+			document.getElementById(id).innerHTML = this._getMeasureHtml() + '<div id="main_div_'+this.GridId+'" style="margin-left: '+collapse_correction+'px">'+this.Html+'</div>';
 		}
 		else {
 			document.getElementById(id).innerHTML = '<div id="main_div_'+this.GridId+'">'+this.Html+'</div>';
@@ -327,6 +324,7 @@
 }
 
 GridScroller.prototype.afterLoad = function() {
+	this.RefreshPos();
 	this.AutoResize();
 	this.SetResizeHandles();
 }
@@ -771,6 +769,7 @@
 	}
 	this.ResizeHappening = true;
 	this.ResizeTimer = window.setTimeout(function() {
+			obj.RefreshPos();
 			obj.Resize( obj.GetAutoSize() );
 			obj.ResizeHappening = false;
 		}, 300)