diff --git a/www/extras/admin/toolbar.js b/www/extras/admin/toolbar.js
index ff8f25931..bfa29e892 100644
--- a/www/extras/admin/toolbar.js
+++ b/www/extras/admin/toolbar.js
@@ -100,8 +100,12 @@ WebGUI.Toolbar.prototype.render
 
     // Edit button
     var editButton = new YAHOO.widget.Button({
+        type        : "push",
         "container" : this.container,
-        label       : assetData.helpers["edit"].label
+        label       : assetData.helpers["edit"].label,
+        onclick     : {
+            fn: window.parent.admin.getHelperHandler( this.assetId, "edit", assetData.helpers["edit"] )
+        }
     });
 
     // Add the container to our parent