diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index dafb77ef4..c69b8d8fd 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -168,9 +168,9 @@ a img {
 }
 #editorcontainer {
   position: absolute;
-  width: 100%;
   top: 37px; /* + 1px border */
   left: 0px;
+  right: 0px;
   bottom: 0px;
   z-index: 1;
 }
diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 38d6f38d3..ed9b258f0 100644
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -42,13 +42,13 @@ var chat = (function()
         padcookie.setPref("chatAlwaysVisible", true);
         $('#chatbox').addClass("stickyChat");
         $('#chattext').css({"top":"0px"});
-        $('#editorcontainer').css({"right":"192px", "width":"auto"});
+        $('#editorcontainer').css({"right":"192px"});
         isStuck = true;
       } else { // Unstick it
         padcookie.setPref("chatAlwaysVisible", false);
         $('#chatbox').removeClass("stickyChat");
         $('#chattext').css({"top":"25px"});
-        $('#editorcontainer').css({"right":"0px", "width":"100%"});
+        $('#editorcontainer').css({"right":"0px"});
         isStuck = false;
       }
     },