diff --git a/customize.dist/main.js b/customize.dist/main.js
index 52804a105..af0afa95b 100644
--- a/customize.dist/main.js
+++ b/customize.dist/main.js
@@ -139,6 +139,8 @@ define([
         });
     };
 
+
+    displayCreateButtons();
     Cryptpad.ready(function () {
         console.log("ready");
 
@@ -149,7 +151,6 @@ define([
         DecorateToolbar.main($('#bottom-bar'));
         Cryptpad.styleAlerts();
 
-        displayCreateButtons();
         refreshTable();
         if (Cryptpad.store && Cryptpad.store.change) {
             Cryptpad.store.change(function (data) {
diff --git a/www/pad/main.js b/www/pad/main.js
index 8f59a898c..b7f717704 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -121,7 +121,6 @@ define([
                 el.setAttribute('class', 'non-realtime');
             });
 
-            editor.execCommand('maximize');
             var documentBody = ifrw.$('iframe')[0].contentDocument.body;
 
             var inner = window.inner = documentBody;
@@ -629,6 +628,8 @@ define([
 
             // this should only ever get called once, when the chain syncs
             var onReady = realtimeOptions.onReady = function (info) {
+                editor.execCommand('maximize');
+
                 module.patchText = TextPatcher.create({
                     realtime: info.realtime,
                     //logging: true,