diff --git a/www/slide/main.js b/www/slide/main.js
index 4b36c9991..d6434bea4 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -572,7 +572,6 @@ define([
 
                 // Update the user list (metadata) from the hyperjson
                 Metadata.update(userDoc);
-
                 editor.setValue(newDoc || initialState);
 
                 if (Cryptpad.initialName && Title.isDefaultTitle()) {
@@ -593,7 +592,6 @@ define([
                             slideNumber = ' (' + ++n + '/' + l + ')';
                         }
                     }
-                    console.log("Exiting presentation mode");
                     document.title = Title.title + slideNumber;
                 });
 
@@ -602,6 +600,7 @@ define([
                 initializing = false;
 
                 onLocal(); // push local state to avoid parse errors later.
+                Slide.update(editor.getValue());
 
                 if (readOnly) { return; }
                 UserList.getLastName(toolbar.$userNameButton, isNew);
diff --git a/www/slide/slide.css b/www/slide/slide.css
index 5dc615a49..48ccd660a 100644
--- a/www/slide/slide.css
+++ b/www/slide/slide.css
@@ -201,7 +201,7 @@ body .CodeMirror-focused .cm-matchhighlight {
   position: fixed;
   top: 0px;
   left: 0px;
-  z-index: 100;
+  z-index: 100000;
   height: 100vh;
   width: 100%;
 }
diff --git a/www/slide/slide.less b/www/slide/slide.less
index 3596280f5..459267186 100644
--- a/www/slide/slide.less
+++ b/www/slide/slide.less
@@ -200,7 +200,7 @@ div.modal, div#modal {
         position: fixed;
         top: 0px;
         left: 0px;
-        z-index: 100;
+        z-index: 100000;
         height: 100vh;
         width: 100%;
     }