diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index e7cd73e15..5d7a107e4 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -124,7 +124,7 @@
             {% endif %}
           </li>
           {% if user.is_authenticated %}
-            <li id="logout_nojs">
+            <li id="logout-nojs">
               <a href="{% url 'users:logout' %}" title="Log out">
                 <i class="glyphicon glyphicon-remove-circle nav-icon"></i>
                 Log out</a>
@@ -184,12 +184,6 @@
   <script type="text/javascript" src="{% static '/javascript/jquery/jquery.min.js' %}"></script>
   <!-- Local link to system Bootstrap JS -->
   <script type="text/javascript" src="{% static '/javascript/bootstrap/js/bootstrap.min.js' %}"></script>
-  <!-- Hide log out button if user dropdown is available -->
-  <script type="text/javascript">
-    (function($) {
-      $("#logout_nojs").hide();
-    })(jQuery);
-  </script>
 
   {% block app_js %}<!-- placeholder for app-specific js files -->{% endblock %}
   {% block page_js %}<!-- placeholder for page-specific js files -->{% endblock %}
diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css
index 7f15c1a17..09f0bbeb0 100644
--- a/static/themes/default/css/plinth.css
+++ b/static/themes/default/css/plinth.css
@@ -32,3 +32,13 @@ body {
 .running-status.inactive {
     background-color: rgb(228, 66, 66);
 }
+
+/* Hide log out button if user dropdown is available */
+.js #logout-nojs {
+    display: none;
+}
+
+/* Hide the dropdown icon when javascript is not available */
+.no-js .nav .dropdown .caret {
+    display: none;
+}