diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index 2e774a38a..a96dc4f1b 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -222,7 +222,6 @@ function handshake()
   });
 
   socket.on('reconnecting', function() {
-    padeditor.disable();
     pad.collabClient.setStateIdle();
     pad.collabClient.setIsPendingRevision(true);
     pad.collabClient.setChannelState("RECONNECTING");
@@ -752,10 +751,15 @@ var pad = {
     if (newState == "CONNECTED")
     {
       padeditor.enable();
+      padeditbar.enable();
+      padimpexp.enable();
       padconnectionstatus.connected();
     }
     else if (newState == "RECONNECTING")
     {
+      padeditor.disable();
+      padeditbar.disable();
+      padimpexp.disable();
       padconnectionstatus.reconnecting();
     }
     else if (newState == "DISCONNECTED")
diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 07ca5a22b..30d223059 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -146,7 +146,7 @@ var padeditbar = (function()
       self.dropdowns = [];
 
       $("#editbar .editbarbutton").attr("unselectable", "on"); // for IE
-      $("#editbar").removeClass("disabledtoolbar").addClass("enabledtoolbar");
+      this.enable();
       $("#editbar [data-key]").each(function () {
         $(this).unbind("click");
         (new ToolbarItem($(this))).bind(function (command, item) {
@@ -194,6 +194,10 @@ var padeditbar = (function()
     {
       $("#editbar").addClass('disabledtoolbar').removeClass("enabledtoolbar");
     },
+    enable: function()
+    {
+      $('#editbar').addClass('enabledtoolbar').removeClass('disabledtoolbar');
+    },
     commands: {},
     registerCommand: function (cmd, callback) {
       this.commands[cmd] = callback;