diff --git a/www/slide/main.js b/www/slide/main.js
index 18cb06be1..4b36c9991 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -68,7 +68,7 @@ define([
 
             var setTabTitle = function (title) {
                 var slideNumber = '';
-                if (Slide.index && Slide.content.length) {
+                if (Slide.shown) { //Slide.index && Slide.content.length) {
                     slideNumber = ' (' + Slide.index + '/' + Slide.content.length + ')';
                 }
                 document.title = title + slideNumber;
@@ -587,12 +587,14 @@ define([
                 });
 
                 Slide.onChange(function (o, n, l) {
+                    var slideNumber = '';
                     if (n !== null) {
-                        document.title = Title.title + ' (' + (++n) + '/' + l +  ')';
-                        return;
+                        if (Slide.shown) { //Slide.index && Slide.content.length) {
+                            slideNumber = ' (' + ++n + '/' + l + ')';
+                        }
                     }
                     console.log("Exiting presentation mode");
-                    document.title = Title.title;
+                    document.title = Title.title + slideNumber;
                 });
 
                 Cryptpad.removeLoadingScreen();
diff --git a/www/slide/slide.css b/www/slide/slide.css
index 2fa01e6f2..5dc615a49 100644
--- a/www/slide/slide.css
+++ b/www/slide/slide.css
@@ -132,6 +132,7 @@ body .CodeMirror-focused .cm-matchhighlight {
   page-break-after: always;
   position: relative;
   box-sizing: border-box;
+  overflow: hidden;
   align-items: center;
   justify-content: center;
 }
@@ -214,6 +215,7 @@ body .CodeMirror-focused .cm-matchhighlight {
 }
 .cp div.modal #content .slide-frame,
 .cp div#modal #content .slide-frame {
+  overflow: hidden;
   display: inline-block;
   box-sizing: border-box;
   border: 1px solid;
diff --git a/www/slide/slide.less b/www/slide/slide.less
index 83778ee7d..3596280f5 100644
--- a/www/slide/slide.less
+++ b/www/slide/slide.less
@@ -138,6 +138,7 @@ body {
         page-break-after: always;
         position: relative;
         box-sizing: border-box;
+        overflow: hidden;
         li {
             min-width: @ratio*50vw;
         }
@@ -210,6 +211,7 @@ div.modal, div#modal {
         overflow: visible;
         white-space: nowrap;
         .slide-frame {
+            overflow: hidden;
             display: inline-block;
             box-sizing: border-box;
             border: 1px solid;