diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 2ce8dbb66..601200ab5 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -1402,7 +1402,7 @@ input[type=checkbox] {
   float: left;
   width: 50%;
 }
-#settingsmenu,
+#settings,
 #importexport,
 #embed {
   position: absolute;
@@ -1546,7 +1546,7 @@ input[type=checkbox] {
       box-sizing: border-box;
       width: 100%;
     }
-    #settingsmenu,
+    #settings,
     #importexport,
     #embed {
       left: 0;
diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index dec32b466..cede9f37c 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -119,7 +119,7 @@ var padeditbar = (function()
         }
         else if (cmd == 'settings')
         {
-              self.toogleDropDown("settingsmenu");
+              self.toogleDropDown("settings");
         }
         else if (cmd == 'embed')
         {
@@ -177,12 +177,11 @@ var padeditbar = (function()
     },
     toogleDropDown: function(moduleName)
     {
-      var modules = ["settingsmenu", "importexport", "embed", "users"];
+      var modules = ["settings", "importexport", "embed", "users"];
       
-      //hide all modules
+      // hide all modules and remove highlighting of all buttons
       if(moduleName == "none")
       {
-        $(".toolbar ul.menu_right li").removeClass("selected");
         for(var i=0;i<modules.length;i++)
         {
           //skip the userlist
@@ -193,29 +192,27 @@ var padeditbar = (function()
         
           if(module.css('display') != "none")
           {
+            $("#" + modules[i] + "link").removeClass("selected");
             module.slideUp("fast");
           }
         }
       }
       else 
       {
-        var nth_child = indexOf(modules, moduleName) + 1;
-        if (nth_child > 0 && nth_child <= (modules.length-1)) {
-          $(".toolbar ul.menu_right li:not(:nth-child(" + nth_child + "))").removeClass("selected");
-          $(".toolbar ul.menu_right li:nth-child(" + nth_child + ")").toggleClass("selected");
-        }
-        if(modules[modules.length-1] === moduleName) $(".toolbar ul.menu_right li").removeClass("selected");
-        //hide all modules that are not selected and show the selected one
+        // hide all modules that are not selected and remove highlighting
+        // respectively add highlighting to the corresponding button
         for(var i=0;i<modules.length;i++)
         {
           var module = $("#" + modules[i]);
         
           if(module.css('display') != "none")
           {
+            $("#" + modules[i] + "link").removeClass("selected");
             module.slideUp("fast");
           }
           else if(modules[i]==moduleName)
           {
+            $("#" + modules[i] + "link").addClass("selected");
             module.slideDown("fast");
           }
         }
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index 6e9b4d2e8..0f3a5feb6 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -2,10 +2,10 @@
   <head>
     <title>Plugin manager</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
-    <link rel="stylesheet" href="../../static/css/admin.css">
-    <script src="../../static/js/jquery.js"></script>
-    <script src="../../socket.io/socket.io.js"></script>
-    <script src="../../static/js/admin/plugins.js"></script>
+    <link rel="stylesheet" href="../static/css/admin.css">
+    <script src="../static/js/jquery.js"></script>
+    <script src="../socket.io/socket.io.js"></script>
+    <script src="../static/js/admin/plugins.js"></script>
   </head>
   <body>
     <div id="wrapper">
@@ -20,7 +20,7 @@
 
 
       <h1>Etherpad Lite</h1>
-      <div class="seperator"></div> 
+      <div class="seperator"></div>
       <h2>Installed plugins</h2>
       <table>
         <thead>
@@ -44,7 +44,7 @@
       </table>
 
       <div class="paged listing search-results">
-        <div class="seperator"></div> 
+        <div class="seperator"></div>
         <h2>Search for plugins to install</h2>
         <form>
           <input type="text" name="search" placeholder="Search term" id="search-query">
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 3eced909f..a474c0453 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -113,7 +113,7 @@
             <div id="editorloadingbox">Loading...</div>
         </div>
 
-        <div id="settingsmenu" class="popup">
+        <div id="settings" class="popup">
             <h1>Pad settings</h1>
             <div class="column">
                 <h2>My view</h2>
