diff --git a/templates/2k11/admin/category.inc.tpl b/templates/2k11/admin/category.inc.tpl
index bce96762..f1f849bc 100644
--- a/templates/2k11/admin/category.inc.tpl
+++ b/templates/2k11/admin/category.inc.tpl
@@ -132,6 +132,7 @@
                 <div class="form_field">
                     <label for="category_icon">{$CONST.CATEGORY} {$CONST.IMAGE}</label>
                     <input id="category_icon" name="serendipity[cat][icon]" type="text" value="{$this_cat.category_icon|default:""|escape}">
+                    <button id="insert_image" type="button" name="insImage" title="{$CONST.MEDIA_LIBRARY}"><span class="icon-picture"></span><span class="visuallyhidden"> {$CONST.MEDIA_LIBRARY}</span></button>
                 </div>
 
                 <figure id="preview">
diff --git a/templates/2k11/admin/serendipity_editor.js.tpl b/templates/2k11/admin/serendipity_editor.js.tpl
index b39c5a1e..ddda60c3 100644
--- a/templates/2k11/admin/serendipity_editor.js.tpl
+++ b/templates/2k11/admin/serendipity_editor.js.tpl
@@ -1135,14 +1135,8 @@ $(function() {
     });
 
     // Category icon preview
-    // NOTE: This is just to replace the old functionality; ideally, this should
-    //       have a working no-js fallback
-    if($('#category_icon').length > 0) {
-        $('<button id="insert_image" type="button" name="insImage" title="{$CONST.MEDIA_LIBRARY}"><span class="icon-picture"></span><span class="visuallyhidden"> {$CONST.MEDIA_LIBRARY}</span></button>').insertAfter('#category_icon');
-    }
-
     $('#insert_image').click(function(e) {
-        serendipity.openPopup('serendipity_admin.php?serendipity[adminModule]=media&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[showMediaToolbar]=false&serendipity[htmltarget]=category_icon&serendipity[filename_only]=true');
+        serendipity.choose_media('category_icon');
     });
 
     $('#category_icon').change(function() {
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index c20f2b93..45840100 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -2140,6 +2140,8 @@ label .perm_name,
 .no-js .toggle_comment_full,
 .no-js #add_upload,
 .no-js .choose_media,
+.no-js #insert_image,
+.no-js #category_preview #preview,
 .no-js .media_show_info,
 .no-js .media_rename,
 .no-js .template_show_info,