diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 3b600fd3..226c1f7c 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -402,6 +402,7 @@ table#otheruserstable {
   font-style: italic;
 }
 
+#connectivitylink,
 #connectivity {
   z-index: 600 !important;
 }
@@ -420,17 +421,17 @@ table#otheruserstable {
   padding: 5px;
 }
 
-#modaloverlay {
+.toolbar #overlay {
   z-index: 500;
   display: none;
   background-repeat: repeat-both;
   width: 100%;
   position: absolute;
-  height: 100%;
+  height: inherit;
   left: 0;
   top: 0;
 }
-* html #modaloverlay {
+* html #overlay {
   /* for IE 6+ */
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
   filter: alpha(opacity=100);
diff --git a/src/static/js/pad_modals.js b/src/static/js/pad_modals.js
index 720fdfc1..174779df 100644
--- a/src/static/js/pad_modals.js
+++ b/src/static/js/pad_modals.js
@@ -40,7 +40,7 @@ var padmodals = (function()
       });
     },
     showOverlay: function(duration) {
-      $("#modaloverlay").show().css(
+      $("#overlay").show().css(
       {
         'opacity': 0
       }).animate(
@@ -49,7 +49,7 @@ var padmodals = (function()
       }, duration);
     },
     hideOverlay: function(duration) {
-      $("#modaloverlay").animate(
+      $("#overlay").animate(
       {
         'opacity': 0
       }, duration, function()
diff --git a/src/templates/pad.html b/src/templates/pad.html
index a01016cd..4c02bdf6 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -22,6 +22,9 @@
 
         <% e.begin_block("body"); %>
         <div id="editbar" class="toolbar">
+            <div id="overlay">
+                <div id="overlay-inner"></div>
+            </div>
             <ul class="menu_left">
                 <% e.begin_block("editbarMenuLeft"); %>
                 <li class="acl-write" id="bold" data-key="bold">
@@ -313,10 +316,6 @@
 
         <div id="focusprotector">&nbsp;</div>
 
-        <div id="modaloverlay">
-            <div id="modaloverlay-inner"></div>
-        </div>
-
         <% e.end_block(); %>
 
         <% e.begin_block("scripts"); %>