diff --git a/administrator/components/com_plugins/models/forms/filter_plugins.xml b/administrator/components/com_plugins/models/forms/filter_plugins.xml
index 6e7bd07ff06d6..5296e275a4ab9 100644
--- a/administrator/components/com_plugins/models/forms/filter_plugins.xml
+++ b/administrator/components/com_plugins/models/forms/filter_plugins.xml
@@ -38,33 +38,28 @@
 
     <fields name="list">
         <field
-                name="sortTable"
+                name="fullordering"
                 type="list"
                 label="JGLOBAL_SORT_BY"
-                description="JFIELD_ORDERING_DESC"
-                onchange="Joomla.orderTable();"
-                default="a.id DESC"
+                description="JGLOBAL_SORT_BY"
+                onchange="this.form.submit();"
+                default="folder DESC"
                 >
             <option value="">JGLOBAL_SORT_BY</option>
-            <option value="ordering">JGRID_HEADING_ORDERING</option>
-            <option value="enabled">JSTATUS</option>
-            <option value="name">JGLOBAL_TITLE</option>
-            <option value="folder">COM_PLUGINS_FOLDER_HEADING</option>
-            <option value="element">COM_PLUGINS_ELEMENT_HEADING</option>
-            <option value="access">JGRID_HEADING_ACCESS</option>
-            <option value="extension_id">JGRID_HEADING_ID</option>
-        </field>
-
-        <field
-                name="directionTable"
-                type="list"
-                label="JGLOBAL_ORDER_DIRECTION_LABEL"
-                description="JGLOBAL_ORDER_DIRECTION_DESC"
-                onchange="Joomla.orderTable();"
-                >
-            <option value="">JFIELD_ORDERING_DESC</option>
-            <option value="asc">JGLOBAL_ORDER_ASCENDING</option>
-            <option value="desc">JGLOBAL_ORDER_DESCENDING</option>
+            <option value="ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+            <option value="ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+            <option value="enabled ASC">JSTATUS_ASC</option>
+            <option value="enabled DESC">JSTATUS_DESC</option>
+            <option value="name ASC">JGLOBAL_TITLE_ASC</option>
+            <option value="name DESC">JGLOBAL_TITLE_DESC</option>
+            <option value="folder ASC">COM_PLUGINS_HEADING_FOLDER_ASC</option>
+            <option value="folder DESC">COM_PLUGINS_HEADING_FOLDER_DESC</option>
+            <option value="element ASC">COM_PLUGINS_HEADING_ELEMENT_ASC</option>
+            <option value="element DESC">COM_PLUGINS_HEADING_ELEMENT_DESC</option>
+            <option value="access ASC">JGRID_HEADING_ACCESS_ASC</option>
+            <option value="access DESC">JGRID_HEADING_ACCESS_DESC</option>
+            <option value="extension_id ASC">JGRID_HEADING_ID_ASC</option>
+            <option value="extension_id DESC">JGRID_HEADING_ID_DESC</option>
         </field>
 
         <field
@@ -75,4 +70,4 @@
                 onchange="this.form.submit();"
                 />
     </fields>
-</form>
\ No newline at end of file
+</form>
diff --git a/administrator/components/com_plugins/views/plugins/tmpl/default.php b/administrator/components/com_plugins/views/plugins/tmpl/default.php
index 4607e1de798b0..77a5e4afd0f34 100644
--- a/administrator/components/com_plugins/views/plugins/tmpl/default.php
+++ b/administrator/components/com_plugins/views/plugins/tmpl/default.php
@@ -68,29 +68,29 @@
 			<table class="table table-striped" id="pluginList">
 				<thead>
 					<tr>
-						<th width="1%" class="nowrap center">
-							<?php echo JHtml::_('grid.sort', '<span class="icon-menu-2"></span>', 'ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+						<th width="1%" class="hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 						</th>
 						<th width="1%" class="hidden-phone">
 							<?php echo JHtml::_('grid.checkall'); ?>
 						</th>
-						<th width="1%" class="nowrap center">
-							<?php echo JHtml::_('grid.sort', 'JSTATUS', 'enabled', $listDirn, $listOrder); ?>
+						<th width="1%" class="nowrap center" style="min-width:55px">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'enabled', $listDirn, $listOrder); ?>
 						</th>
 						<th class="title">
-							<?php echo JHtml::_('grid.sort', 'COM_PLUGINS_NAME_HEADING', 'name', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_NAME_HEADING', 'name', $listDirn, $listOrder); ?>
 						</th>
 						<th width="10%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('grid.sort', 'COM_PLUGINS_FOLDER_HEADING', 'folder', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_FOLDER_HEADING', 'folder', $listDirn, $listOrder); ?>
 						</th>
 						<th width="10%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('grid.sort', 'COM_PLUGINS_ELEMENT_HEADING', 'element', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_ELEMENT_HEADING', 'element', $listDirn, $listOrder); ?>
 						</th>
 						<th width="5%" class="hidden-phone">
-							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
 						</th>
 						<th width="1%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
 				</thead>
@@ -128,7 +128,7 @@
 								<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering;?>" class="width-20 text-area-order " />
 							<?php endif; ?>
 						</td>
-						<td class="center">
+						<td class="center hidden-phone">
 							<?php echo JHtml::_('grid.id', $i, $item->extension_id); ?>
 						</td>
 						<td class="center">
@@ -165,8 +165,6 @@
 
 		<input type="hidden" name="task" value="" />
 		<input type="hidden" name="boxchecked" value="0" />
-		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
 </form>
diff --git a/administrator/language/en-GB/en-GB.com_plugins.ini b/administrator/language/en-GB/en-GB.com_plugins.ini
index 3465198601679..516af78b8c254 100644
--- a/administrator/language/en-GB/en-GB.com_plugins.ini
+++ b/administrator/language/en-GB/en-GB.com_plugins.ini
@@ -17,6 +17,10 @@ COM_PLUGINS_FIELD_FOLDER_LABEL="Plugin Type"
 COM_PLUGINS_FIELD_NAME_DESC="The name of the plugin as defined in its xml."
 COM_PLUGINS_FIELD_NAME_LABEL="Plugin Name"
 COM_PLUGINS_FOLDER_HEADING="Type"
+COM_PLUGINS_HEADING_ELEMENT_ASC="Element ascending"
+COM_PLUGINS_HEADING_ELEMENT_DESC="Element descending"
+COM_PLUGINS_HEADING_FOLDER_ASC="Type ascending"
+COM_PLUGINS_HEADING_FOLDER_DESC="Type descending"
 COM_PLUGINS_MANAGER_PLUGIN="Plugins: %s"
 COM_PLUGINS_MANAGER_PLUGINS="Plugins"
 COM_PLUGINS_MSG_MANAGE_NO_PLUGINS="There are no plugins installed matching your query."