diff --git a/templates/2k11/admin/entries.tpl b/templates/2k11/admin/entries.tpl
index 361b9f17..614eda55 100644
--- a/templates/2k11/admin/entries.tpl
+++ b/templates/2k11/admin/entries.tpl
@@ -107,6 +107,12 @@
             <div id="edit_entry_category" class="clearfix mfp-hide">
                 <fieldset>
                     <span class="wrap_legend"><legend>{$CONST.CATEGORY}</legend></span>
+
+                    <div class="category_filter">
+                        <label for="categoryfilter">{$CONST.FILTERS}</label>
+                        <input type="text" id="categoryfilter">
+                    </div>
+
                 {foreach from=$entry_vars.category_options item="entry_cat"}
                     <div class="form_check">
                         {$entry_cat.depth_pad}
diff --git a/templates/2k11/admin/serendipity_editor.js.tpl b/templates/2k11/admin/serendipity_editor.js.tpl
index 2c5f58bc..8647d393 100644
--- a/templates/2k11/admin/serendipity_editor.js.tpl
+++ b/templates/2k11/admin/serendipity_editor.js.tpl
@@ -983,6 +983,22 @@ $(function() {
         }
     {/if}
 
+    $('#categoryfilter').keyup(function() {
+        var current_categoryfilter = $(this).val().toLowerCase();
+
+        if (current_categoryfilter == '') {
+            $('#edit_entry_category .form_check').toggle(true);
+        } else {
+            $('#edit_entry_category .form_check').each(function() {
+                if ($(this).find('label').html().toLowerCase().indexOf(current_categoryfilter) > -1) {
+                    $(this).toggle(true);
+                } else {
+                    $(this).toggle(false);
+                }
+            });
+        }
+    });
+
     // Advanced options
     if($('#advanced_options').length > 0) {
         $('#toggle_advanced').click(function() {