diff --git a/templates/2k11/admin/media_pane.tpl b/templates/2k11/admin/media_pane.tpl
index b82cf92e..ff480d8b 100644
--- a/templates/2k11/admin/media_pane.tpl
+++ b/templates/2k11/admin/media_pane.tpl
@@ -92,7 +92,7 @@
 
                     <div id="keyword_list" class="clearfix">
                     {foreach from=$media.keywords item="keyword"}
-                        <a href="#" onclick="AddKeyword('{$keyword|@escape}'); return false">{$keyword|@escape}</a>
+                        <a class="add_keyword" href="#" data-keyword="{$keyword|@escape}">{$keyword|@escape}</a>
                     {/foreach}
                     </div>
                 </div>
diff --git a/templates/2k11/admin/serendipity_editor.js.tpl b/templates/2k11/admin/serendipity_editor.js.tpl
index 8963b1fd..89f4c09b 100644
--- a/templates/2k11/admin/serendipity_editor.js.tpl
+++ b/templates/2k11/admin/serendipity_editor.js.tpl
@@ -861,6 +861,11 @@ function highlightComment(id, checkvalue) {
         e.preventDefault();
     });
 
+    $('.add_keyword').click(function(e) {
+        AddKeyword($(this).attr('data-keyword'));
+        e.preventDefault();
+    });
+
     // Confirm media scale
     $('.image_scale').click(function(e) {
         if (confirm('{$CONST.REALLY_SCALE_IMAGE}')) document.serendipityScaleForm.submit();