diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index 25b1a24d..f8ff8578 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -769,6 +769,7 @@ var pad = {
     var wasConnecting = (padconnectionstatus.getStatus().what == 'connecting');
     if (newState == "CONNECTED")
     {
+      padeditor.enable();
       padconnectionstatus.connected();
     }
     else if (newState == "RECONNECTING")
diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js
index 6616ebe8..3e6b49d3 100644
--- a/src/static/js/pad_editor.js
+++ b/src/static/js/pad_editor.js
@@ -198,6 +198,13 @@ var padeditor = (function()
         self.ace = null;
       }
     },
+    enable: function()
+    {
+      if (self.ace)
+      {
+        self.ace.setEditable(true);
+      }
+    },
     disable: function()
     {
       if (self.ace)