diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 19998418b..95ad4f786 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -897,7 +897,7 @@ input[type=checkbox] {
 #connectivity,
 #users {
   position: absolute;
-  top: 36px;
+  top: 38px;
   right: 20px;
   display: none;
   z-index: 500;
diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 102f4637a..7fd687eab 100644
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -22,7 +22,6 @@ var hooks = require('./pluginfw/hooks');
 var chat = (function()
 {
   var isStuck = false;
-  var userAndChat = false;
   var gotInitialMessages = false;
   var historyPointer = 0;
   var chatMentions = 0;
@@ -58,14 +57,15 @@ var chat = (function()
     chatAndUsers: function(fromInitialCall)
     {
       var toEnable = $('#options-chatandusers').is(":checked");
-      if(toEnable || !userAndChat || fromInitialCall){
+      if(toEnable || fromInitialCall){
         padcookie.setPref("chatAndUsers", true);
         chat.stickToScreen(true);
         $('#options-stickychat').prop('checked', true)
         $('#options-stickychat').prop("disabled", "disabled");
         $('#users').addClass("chatAndUsers");
         $("#chatbox").addClass("chatAndUsersChat");
-        userAndChat = true;
+        // redraw
+        padeditbar.redrawHeight()
       }else{
         padcookie.setPref("chatAndUsers", false);
         $('#options-stickychat').prop("disabled", false);
diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 4fcb20ea6..4dc80860e 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -187,6 +187,9 @@ var padeditbar = (function()
 
       $('#editorcontainer').css("top", containerTop);
 
+      // make sure pop ups are in the right place
+      $('.popup').css("top", $('#editorcontainer').offset().top + "px");
+
       // If sticky chat is enabled..
       if($('#options-stickychat').is(":checked")){
         $('#chatbox').css("top", $('#editorcontainer').offset().top + "px");