diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 1857bd034..3174bf506 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -206,7 +206,7 @@ var padeditbar = (function()
 
           if(module.css('display') != "none")
           {
-            $("#" + module[i] + "link").removeClass("selected");
+            $("#" + self.dropdowns[i] + "link").removeClass("selected");
             module.slideUp("fast", cb);
             returned = true;
           }
@@ -297,7 +297,7 @@ var padeditbar = (function()
       ace.ace_doUndoRedo(cmd);
     });
 
-    toolbar.registerAceCommand("redo", function (cmd, ace) {
+    toolbar.registerAceCommand("redo", function (cmd) {
       ace.ace_doUndoRedo(cmd);
     });
 
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index 2e00b8c2a..4696c4757 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -80,7 +80,7 @@
           <div class="editbarright toolbar" id="editbar">
             <% e.begin_block("timesliderEditbarRight"); %>
             <ul>
-              <li onClick="window.padeditbar.toolbarClick('import_export');return false;">
+              <li onClick="window.padeditbar.triggerCommand('import_export');return false;">
                 <a id="exportlink" data-l10n-id="timeslider.toolbar.exportlink.title">
                   <div class="buttonicon buttonicon-import_export"></div>
                 </a>
@@ -241,6 +241,8 @@
       /* TODO: These globals shouldn't exist. */
       padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
       padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
+
+      padeditbar.init()
     });
   })();
 </script>