diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index c7906114..e2a802e4 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -10,9 +10,6 @@ var ss_MainLayout;
 
 (function($) {
 	$.entwine('ss', function($){
-		
-		$('.nojs-warning').hide();
-		
 		/**
 		 * Position the loading spinner animation below the ss logo
 		 */ 
diff --git a/templates/LeftAndMain.ss b/templates/LeftAndMain.ss
index 2728da56..51cea1f2 100644
--- a/templates/LeftAndMain.ss
+++ b/templates/LeftAndMain.ss
@@ -12,7 +12,7 @@
 	<div class="ss-loading-screen">
 		<div class="loading-logo" style="background-image: url($LoadingImage);">
 			<img class="loading-animation" src="cms/images/spinner.gif" alt="<% _t('LOADING','Loading...',PR_HIGH) %>" />
-			<p class="nojs-warning"><span class="message notice"><% _t('REQUIREJS','The CMS requires that you have JavaScript enabled.',PR_HIGH) %></span></p>
+			<noscript><p class="nojs-warning"><span class="message notice"><% _t('REQUIREJS','The CMS requires that you have JavaScript enabled.',PR_HIGH) %></span></p></noscript>
 		</div>
 	</div>