diff --git a/templates/2k11/admin/entries.tpl b/templates/2k11/admin/entries.tpl
index 3faebf72..29b5ee49 100644
--- a/templates/2k11/admin/entries.tpl
+++ b/templates/2k11/admin/entries.tpl
@@ -15,6 +15,12 @@
         <input id="entryTitle" name="serendipity[title]" type="text" value="{$entry_vars.entry.title|@escape}">
     </div>
 
+    <div id="category_list" class="clearfix">
+        <h3>{$CONST.CATEGORIES}</h3>
+
+        <ul class="plainList"></ul>
+    </div>
+
     <div class="form_area">
         <label for="serendipity[body]">{$CONST.ENTRY_BODY}</label>
     {if NOT $entry_vars.wysiwyg}
@@ -34,12 +40,6 @@
         <textarea id="serendipity[body]" name="serendipity[body]" rows="15">{$entry_vars.entry.body|@escape}</textarea>
     </div>
 
-    <div id="category_list" class="clearfix">
-        <h3>{$CONST.CATEGORIES}</h3>
-
-        <ul class="plainList"></ul>
-    </div>
-
     <div id="edit_entry_submit">
         <button id="reset_timestamp" class="button_link" type="button" href="#serendipityNewTimestamp" data-currtime="{$entry_vars.reset_timestamp|@formatTime:'o-m-d\TH:i':true:false:true}" title="{$CONST.RESET_DATE_DESC}"><span class="icon-clock"></span><span class="visuallyhidden"> {$CONST.RESET_DATE}</span></button>
         <a id="select_category" class="button_link icon_link" href="#edit_entry_category" title="{$CONST.CATEGORY}"><span class="icon-list-bullet"></span><span class="visuallyhidden">{$CONST.CATEGORIES}</span></a>
diff --git a/templates/2k11/admin/serendipity_editor.js.tpl b/templates/2k11/admin/serendipity_editor.js.tpl
index 04c29945..24c7221b 100644
--- a/templates/2k11/admin/serendipity_editor.js.tpl
+++ b/templates/2k11/admin/serendipity_editor.js.tpl
@@ -1073,7 +1073,7 @@ $(function() {
     // Show category selector
     {if $use_popups}
         if($('#serendipityEntry').length > 0) {
-            $('#select_category').click(function(e) {
+            $('#select_category, #category_list').click(function(e) {
                 $('#edit_entry_category').toggleClass('mfp-hide');
                 $('#toggle_metadata').click();
             });
@@ -1091,6 +1091,10 @@ $(function() {
                     }
                 }
             });
+
+            $('#category_list').click(function(e) {
+                $('#select_category').trigger('click');
+            });
         }
     {/if}
 
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 83801ec8..775128c8 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -1660,14 +1660,18 @@ form > .button_link:first-of-type,
     padding-bottom: .583335em;
 }
 
+#category_list:hover {
+    cursor: pointer;
+}
+
 #category_list h3 {
     float: left;
     line-height: 1.5em;
-    margin: 0 2em .75em 0;
+    margin: .375em 2em .375em 0;
 }
 
 #category_list ul {
-    margin: 0 0 .75em;
+    margin: .375em 0;
     line-height: 1.5em;
 }