diff --git a/src/webui/www/private/css/noscript.css b/src/webui/www/private/css/noscript.css
new file mode 100644
index 000000000..090b572b8
--- /dev/null
+++ b/src/webui/www/private/css/noscript.css
@@ -0,0 +1,8 @@
+#desktop {
+    display: none;
+}
+
+#noscript {
+    color: #f00;
+    text-align: center;
+}
diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html
index e4c9c66a9..d661d92e3 100644
--- a/src/webui/www/private/index.html
+++ b/src/webui/www/private/index.html
@@ -13,6 +13,9 @@
     <link rel="stylesheet" type="text/css" href="css/Layout.css" />
     <link rel="stylesheet" type="text/css" href="css/Window.css" />
     <link rel="stylesheet" type="text/css" href="css/Tabs.css" />
+    <noscript>
+        <link rel="stylesheet" type="text/css" href="css/noscript.css?v=${VERSION}" />
+    </noscript>
     <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
     <script src="scripts/lib/mootools-1.2-more.js"></script>
     <!--[if IE]>
@@ -29,6 +32,9 @@
 </head>
 
 <body>
+    <noscript id="noscript">
+        <h1>QBT_TR(JavaScript Required! You must enable JavaScript for the Web UI to work properly)QBT_TR[CONTEXT=HttpServer]</h1>
+    </noscript>
     <div id="desktop">
         <div id="desktopHeader">
             <!--<div id="desktopTitlebar">
diff --git a/src/webui/www/public/css/noscript.css b/src/webui/www/public/css/noscript.css
new file mode 100644
index 000000000..8897870b3
--- /dev/null
+++ b/src/webui/www/public/css/noscript.css
@@ -0,0 +1,8 @@
+#formplace {
+    display: none;
+}
+
+#noscript {
+    color: #f00;
+    text-align: center;
+}
diff --git a/src/webui/www/public/login.html b/src/webui/www/public/login.html
index 9e1a893da..488180542 100644
--- a/src/webui/www/public/login.html
+++ b/src/webui/www/public/login.html
@@ -7,6 +7,9 @@
     <link rel="icon" type="image/png" href="images/skin/qbittorrent32.png" />
     <link rel="stylesheet" type="text/css" href="css/login.css" />
     <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
+    <noscript>
+        <link rel="stylesheet" type="text/css" href="css/noscript.css?v=${VERSION}" />
+    </noscript>
     <script>
         window.onload = function() {
             $('username').focus();
@@ -51,6 +54,9 @@
 </head>
 
 <body>
+    <noscript id="noscript">
+        <h1>QBT_TR(JavaScript Required! You must enable JavaScript for the Web UI to work properly)QBT_TR[CONTEXT=HttpServer]</h1>
+    </noscript>
     <div id="main">
         <h1>qBittorrent QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]</h1>
         <div id="logo" class="col">
diff --git a/src/webui/www/webui.qrc b/src/webui/www/webui.qrc
index 2c7559cd8..fde542444 100644
--- a/src/webui/www/webui.qrc
+++ b/src/webui/www/webui.qrc
@@ -6,6 +6,7 @@
         <file>private/css/Core.css</file>
         <file>private/css/dynamicTable.css</file>
         <file>private/css/Layout.css</file>
+        <file>private/css/noscript.css</file>
         <file>private/css/style.css</file>
         <file>private/css/Tabs.css</file>
         <file>private/css/Window.css</file>
@@ -47,6 +48,7 @@
         <file>private/upload.html</file>
         <file>private/uploadlimit.html</file>
         <file>public/css/login.css</file>
+        <file>public/css/noscript.css</file>
         <file>public/login.html</file>
         <file>public/scripts/lib/mootools-1.2-core-yc.js</file>
     </qresource>
