diff --git a/customize.dist/main.css b/customize.dist/main.css
index 79d557472..3c2ec600a 100644
--- a/customize.dist/main.css
+++ b/customize.dist/main.css
@@ -721,6 +721,7 @@ html.cp,
   left: 0;
   bottom: 0;
   right: 0;
+  z-index: 2;
 }
 .cp #noscriptContainer #noscript {
   width: 1000px;
@@ -731,7 +732,6 @@ html.cp,
   margin-left: auto;
   margin-right: auto;
   position: relative;
-  z-index: 2;
 }
 .cp #noscriptContainer #noscript noscript {
   font-size: 25px;
diff --git a/customize.dist/main.js b/customize.dist/main.js
index 4c6d37ae5..7498724f7 100644
--- a/customize.dist/main.js
+++ b/customize.dist/main.js
@@ -15,6 +15,8 @@ define([
     $(function () {
         var $main = $('#mainBlock');
 
+        $('#noscriptContainer').remove();
+
         // Language selector
         var $sel = $('#language-selector');
         Cryptpad.createLanguageSelector(undefined, $sel);
diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less
index e979bc95f..650c03228 100644
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@@ -260,6 +260,7 @@ body.html {
     left: 0;
     bottom: 0;
     right: 0;
+    z-index: 2;
     #noscript {
         width: 1000px;
         display: flex;
@@ -269,7 +270,6 @@ body.html {
         margin-left: auto;
         margin-right: auto;
         position: relative;
-        z-index: 2;
         noscript {
             font-size: 25px;
             text-align: center;
diff --git a/www/login/main.js b/www/login/main.js
index e18732671..04128f402 100644
--- a/www/login/main.js
+++ b/www/login/main.js
@@ -13,6 +13,8 @@ define([
         var $main = $('#mainBlock');
         var Messages = Cryptpad.Messages;
 
+        $('#noscriptContainer').remove();
+
         // Language selector
         var $sel = $('#language-selector');
         Cryptpad.createLanguageSelector(undefined, $sel);
diff --git a/www/register/main.js b/www/register/main.js
index e432830a8..d0a05212a 100644
--- a/www/register/main.js
+++ b/www/register/main.js
@@ -16,6 +16,8 @@ define([
     $(function () {
         var $main = $('#mainBlock');
 
+        $('#noscriptContainer').remove();
+
         // Language selector
         var $sel = $('#language-selector');
         Cryptpad.createLanguageSelector(undefined, $sel);