diff --git a/static/js/pad_editbar.js b/static/js/pad_editbar.js
index f7cd9aae6..2475854e0 100644
--- a/static/js/pad_editbar.js
+++ b/static/js/pad_editbar.js
@@ -100,11 +100,9 @@ var padeditbar = (function()
       var self = this;
       $("#editbar .editbarbutton").attr("unselectable", "on"); // for IE
       $("#editbar").removeClass("disabledtoolbar").addClass("enabledtoolbar");
-      $("#editbar [data-key]").each(function (i, e) {
-        $(e).click(function (event) {
-          self.toolbarClick($(e).attr('data-key'));
-          event.preventDefault();
-        });
+      $("#editbar").delegate('[data-key] > button', 'click', function (event) {
+        self.toolbarClick(($(event.currentTarget).parent()).attr('data-key'));
+        event.preventDefault();
       });
     },
     isEnabled: function()