diff --git a/css/_base.scss b/css/_base.scss
index 435d98b36..439451302 100644
--- a/css/_base.scss
+++ b/css/_base.scss
@@ -169,6 +169,7 @@ form {
 }
 
 .tipsy {
+    z-index: $tooltipsZ;
     &-inner {
         background-color: $tooltipBg;
     }
@@ -176,4 +177,4 @@ form {
     &-arrow {
         border-color: $tooltipBg;
     }
-}
\ No newline at end of file
+}
diff --git a/css/_variables.scss b/css/_variables.scss
index e8cf2fd64..9357ad0ea 100644
--- a/css/_variables.scss
+++ b/css/_variables.scss
@@ -60,6 +60,7 @@ $defaultWatermarkLink: '../images/watermark.png';
 /**
  * Z-indexes. TODO: Replace this by a function.
  */
+$tooltipsZ: 901;
 $toolbarZ: 900;
 $overlayZ: 800;
 
@@ -72,4 +73,4 @@ $defaultDarkFontColor: #000;
 $buttonFontColor: #777;
 $buttonHoverFontColor: #287ade;
 $linkFontColor: #489afe;
-$linkHoverFontColor: #287ade;
\ No newline at end of file
+$linkHoverFontColor: #287ade;
diff --git a/css/_videolayout_default.scss b/css/_videolayout_default.scss
index c2a70dbf4..7a59eaf30 100644
--- a/css/_videolayout_default.scss
+++ b/css/_videolayout_default.scss
@@ -1,8 +1,3 @@
-.video-wrapper {
-    position: relative;
-    z-index: 1;
-}
-
 #videospace {
     display: block;
     position: absolute;
diff --git a/index.html b/index.html
index a8d7a4f9e..e805fed31 100644
--- a/index.html
+++ b/index.html
@@ -95,7 +95,7 @@
         </div>
         <!--#include virtual="plugin.welcomepage.footer.html" -->
     </div>
-    <div id="videoconference_page" class="video-wrapper">
+    <div id="videoconference_page">
         <div id="mainToolbarContainer">
                 <div id="notice" class="notice" style="display: none">
                     <span id="noticeText" class="noticeText"></span>