diff --git a/lib/WebGUI/Admin.pm b/lib/WebGUI/Admin.pm
index 65aa8fa4b..c4a07fdef 100644
--- a/lib/WebGUI/Admin.pm
+++ b/lib/WebGUI/Admin.pm
@@ -596,25 +596,27 @@ __DATA__
             <li class="selected"><a href="#tab1"><em>View</em></a></li>
             <li><a href="#tab2"><em>Tree</em></a></li>
         </ul>
-        <div id="locationBar">
-            <span id="left">
-                <input type="button" id="backButton" value="&lt;" /><input type="button" id="forwardButton" value="&gt;" />
-            </span>
-            <div id="location">
-                <input type="text" id="locationUrl" value="" />
-                <span id="locationTitle"></span>
+        <div id="tab_wrapper">
+            <div id="locationBar">
+                <span id="left">
+                    <input type="button" id="backButton" value="&lt;" /><input type="button" id="forwardButton" value="&gt;" />
+                </span>
+                <div id="location">
+                    <input type="text" id="locationUrl" value="" />
+                    <span id="locationTitle"></span>
+                </div>
+                <span id="right">
+                    <input type="button" id="searchButton" value="S" /><input type="button" id="homeButton" value="H" />
+                </span>
+                <div id="search"></div>
             </div>
-            <span id="right">
-                <input type="button" id="searchButton" value="S" /><input type="button" id="homeButton" value="H" />
-            </span>
-            <div id="search"></div>
-        </div>
-        <div id="tab_wrapper" class="yui-content">
-            <div id="viewTab"><iframe src="<tmpl_var viewUrl>" name="view"></iframe></div>
-            <div id="treeTab">
-                <div id="treeCrumbtrail"></div>
-                <div id="treeDataTableContainer"></div>
-                <div id="treePagination"></div>
+            <div id="tab_content_wrapper" class="yui-content">
+                <div id="viewTab"><iframe src="<tmpl_var viewUrl>" name="view"></iframe></div>
+                <div id="treeTab">
+                    <div id="treeCrumbtrail"></div>
+                    <div id="treeDataTableContainer"></div>
+                    <div id="treePagination"></div>
+                </div>
             </div>
         </div>
     </div>
diff --git a/www/extras/admin/admin.css b/www/extras/admin/admin.css
index 00af35204..5102cc04c 100644
--- a/www/extras/admin/admin.css
+++ b/www/extras/admin/admin.css
@@ -26,10 +26,17 @@ html,body { margin: 0; padding: 0; height: 100% }
     bottom: 0px;
     left: 0px;
     right: 0px;
-    margin-top: 44px; /* below the location bar, easier to change this in JS */
     overflow: hidden;
 }
 
+#tab_content_wrapper {
+    position: absolute;
+    top: 44px; /* below the location bar */
+    bottom: 0px;
+    left: 0px;
+    right: 0px;
+}
+
 #versionTag {
     float: left;
     width: 57%;