diff --git a/static/js/pad.js b/static/js/pad.js
index bda68956e..c9694c0fe 100644
--- a/static/js/pad.js
+++ b/static/js/pad.js
@@ -164,7 +164,8 @@ function handshake()
   //connect
   socket = pad.socket = io.connect(url, {
     resource: resource,
-    'max reconnection attempts': 3,
+    'reconnection limit': 1000*60,
+    'max reconnection attempts': 40,
     'sync disconnect on unload' : false
   });
 
@@ -234,7 +235,7 @@ function handshake()
       
       pad.collabClient.setChannelState("RECONNECTING");
       
-      disconnectTimeout = setTimeout(disconnectEvent, 10000);
+      disconnectTimeout = setTimeout(disconnectEvent, 40000);
     }
   });
 
@@ -693,6 +694,10 @@ var pad = {
     if (newState == "CONNECTED")
     {
       padconnectionstatus.connected();
+      padeditor.enable();
+      padeditbar.enable();
+      paddocbar.enable();
+      padimpexp.enable();
     }
     else if (newState == "RECONNECTING")
     {
diff --git a/static/js/pad_docbar.js b/static/js/pad_docbar.js
index b83bf3bfe..279fa9a5b 100644
--- a/static/js/pad_docbar.js
+++ b/static/js/pad_docbar.js
@@ -446,6 +446,11 @@ var paddocbar = (function()
       enabled = false;
       self.render();
     },
+    enable: function()
+    {
+      enabled = true;
+      self.render();
+    },
     handleResizePage: function()
     {
       // Side-step circular reference. This should be injected.
diff --git a/static/js/pad_editbar.js b/static/js/pad_editbar.js
index 236926310..6feb2d06d 100644
--- a/static/js/pad_editbar.js
+++ b/static/js/pad_editbar.js
@@ -109,6 +109,10 @@ var padeditbar = (function()
     {
       $("#editbar").addClass('disabledtoolbar').removeClass("enabledtoolbar");
     },
+    enable: function()
+    {
+      $("#editbar").removeClass('disabledtoolbar').addClass("enabledtoolbar");
+    },
     toolbarClick: function(cmd)
     {  
       if (self.isEnabled())
diff --git a/static/js/pad_editor.js b/static/js/pad_editor.js
index 3dd67544d..2f5a8f8e7 100644
--- a/static/js/pad_editor.js
+++ b/static/js/pad_editor.js
@@ -151,6 +151,14 @@ var padeditor = (function()
         self.ace.setEditable(false);
       }
     },
+    enable: function()
+    {
+      if (self.ace)
+      {
+        self.ace.setProperty("grayedOut", false);
+        self.ace.setEditable(true);
+      }
+    },
     restoreRevisionText: function(dataFromServer)
     {
       pad.addHistoricalAuthors(dataFromServer.historicalAuthorData);