diff --git a/include/functions_plugins_admin.inc.php b/include/functions_plugins_admin.inc.php
index 7a2dc03c..5589e372 100644
--- a/include/functions_plugins_admin.inc.php
+++ b/include/functions_plugins_admin.inc.php
@@ -152,9 +152,12 @@ function show_plugins($event_only = false, $sidebars = null)
                 $plugin->introspect($bag);
 
                 $name  = htmlspecialchars($bag->get('name'));
-                $desc  = '<var class="perm_name">['.$cname[0].']</var>';
-                $desc .= htmlspecialchars($bag->get('description'));
+
+                $desc  = '<details class="plugin_data">';
+                $desc .= '<summary><var class="perm_name">'.$cname[0].'</var></summary>';
+                $desc .= '<div class="plugin_desc clearfix">' . htmlspecialchars($bag->get('description')) . '</div>';
                 $desc .= '<span class="block_level">' . VERSION  . ': ' . $bag->get('version') . '</span>';
+                $desc .= '</details>';
 
                 $title = serendipity_plugin_api::get_plugin_title($plugin, '[' . $name . ']');
 
diff --git a/templates/2k11/admin/plugins.inc.tpl b/templates/2k11/admin/plugins.inc.tpl
index cf1f96cf..7bf6b86c 100644
--- a/templates/2k11/admin/plugins.inc.tpl
+++ b/templates/2k11/admin/plugins.inc.tpl
@@ -81,7 +81,7 @@
 
                 {if $plug.description}
                     <details class="plugin_data">
-                        <summary><var class="perm_name">[{$plug.class_name}]</var></summary>
+                        <summary><var class="perm_name">{$plug.class_name}</var></summary>
 
                         <div class="plugin_desc clearfix">
                         {$plug.description}
@@ -89,7 +89,7 @@
                     </details>
                 {else}
                     <div class="plugin_data">
-                        <var class="perm_name">[{$plug.class_name}]</var>
+                        <var class="perm_name">{$plug.class_name}</var>
                     </div>
                 {/if}
 
diff --git a/templates/2k11/admin/show_plugins.fnc.tpl b/templates/2k11/admin/show_plugins.fnc.tpl
index 6ab015ae..56188963 100644
--- a/templates/2k11/admin/show_plugins.fnc.tpl
+++ b/templates/2k11/admin/show_plugins.fnc.tpl
@@ -34,8 +34,9 @@
                         <a class="pluginmanager_configure button_link" href="?serendipity[adminModule]=plugins&amp;serendipity[plugin_to_conf]={$plugin_data['key']}" title="{$CONST.CONFIGURATION}"><span class="icon-cog-alt"></span><span class="visuallyhidden"> {$CONST.CONFIGURATION}</span></a>
                     {/if}
 
+                        {$plugin_data['desc']}
+
                         <ul class="pluginmanager_plugininfo plainList">
-                            <li class="pluginmanager_description">{$plugin_data['desc']}</li>
                             <li class="pluginmanager_ownership">
                                 {if $plugin_data.is_plugin_owner}
                                     <select name="serendipity[ownership][{$plugin_data.name}]">
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 5fdceea2..3f9b9abc 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -478,9 +478,7 @@ label > span,
 #mediaPropertyForm .media_file_props label,
 #mediaPropertyForm header b,
 #mediaPropertyForm footer b,
-#content .upgrade_done,
-.pluginmanager_description .perm_name,
-.plugin_data > .perm_name {
+#content .upgrade_done {
     display: block;
 }
 
@@ -503,8 +501,7 @@ details,
 form > a,
 form > button,
 #content .upgrade_done,
-#upgrade_notice,
-.plugin_data > .perm_name {
+#upgrade_notice {
     margin-top: 1.5em;
     margin-bottom: 1.5em;
 }
@@ -515,10 +512,6 @@ form > button,
     margin-bottom: 0;
 }
 
-.pluginmanager_description .perm_name {
-    margin-bottom: .25em;
-}
-
 .plugin_desc {
     margin-top: .25em;
 }
@@ -1038,7 +1031,8 @@ h4,
 }
 
 #diagnose caption,
-.no-js #mediaupload_tabs h3:first-child {
+.no-js #mediaupload_tabs h3:first-child,
+.plugin_data {
     margin-top: 0;
 }
 
@@ -2046,13 +2040,12 @@ label .perm_name,
     right: 5px;
 }
 
-.pluginmanager_plugin .form_check,
-.pluginmanager_plugin h5 {
+.pluginmanager_plugin .form_check {
     margin: .75em 0;
 }
 
-.pluginmanager_description {
-    margin: 0 0 .5em;
+.pluginmanager_plugin h5 {
+    margin: .75em 0 0;
 }
 
 .configuration_group .sequence_grablet,