diff --git a/templates/2k11/admin/plugins.inc.tpl b/templates/2k11/admin/plugins.inc.tpl
index c701bcbb..91790962 100644
--- a/templates/2k11/admin/plugins.inc.tpl
+++ b/templates/2k11/admin/plugins.inc.tpl
@@ -51,26 +51,27 @@
         <input name="serendipity[type]" type="hidden" value="{$type|escape}">
 
         <div class="clearfix">
-            <div id="plugin_groups" class="form_select">
+            {if $only_group != UPGRADE}
+                <div id="plugin_groups" class="form_select">
                 <label for="only_group">{$CONST.GROUP}</label>
                 <select id="only_group" name="serendipity[only_group]">
                 {foreach $groupnames as $available_group => $available_name}
                     <option value="{$available_group}"{if $only_group == $available_group} selected{/if}>{$available_name|default:$CONST.ALL_CATEGORIES}</option>
                 {/foreach}
-                    {if $only_group != UPGRADE}<option value="UPGRADE"{if $only_group == UPGRADE} selected{/if}>{$CONST.WORD_NEW}</option>{/if}
+               
 
                 </select>
-
-                <div class="form_buttons">
-                    <input type="submit" value="{$CONST.GO}">
-                </div>
             </div>
+            {/if}
 
             <div id="plugin_filter" class="form_field">
                 <label for="pluginfilter">{$CONST.QUICKSEARCH}</label>
                 <input id="pluginfilter" type="text">
                 <button class="reset_livefilter icon_link" type="button" data-target="pluginfilter" title="{$CONST.RESET_FILTERS}"><span class="icon-cancel"></span><span class="visuallyhidden">{$CONST.RESET_FILTERS}</span></button>
             </div>
+            <div class="form_buttons">
+                <input type="submit" value="{$CONST.GO}">
+            </div>
         </div>
     </form>
     
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index e6deb7c0..b08c42f8 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -2751,13 +2751,18 @@ img.mfp-img {
     .entryproperties_access_users,
     .entryproperties_access_author,
     .entryproperties_markup,
-    #plugin_groups,
-    #plugin_filter {
+    #plugin_groups {
         float: left;
         margin-right: 2%;
         width: 48%;
     }
 
+    #plugin_filter {
+        display: inline-block;
+        margin-right: 2%;
+        width: 48%;
+    }
+
     #plugin_groups .form_buttons {
         margin-bottom: 0;
     }