diff --git a/include/staff/tasks.inc.php b/include/staff/tasks.inc.php
index 6d52d61fa2952b5413bd9eb6a62aebd71891e3ad..a67a6dc7968ce000998476b44bb7f23ed4b7b7ae 100644
--- a/include/staff/tasks.inc.php
+++ b/include/staff/tasks.inc.php
@@ -284,7 +284,7 @@ if ($thisstaff->hasPerm(Task::PERM_DELETE, false)) {
   <div class="pull-right" style="height:25px">
     <span class="valign-helper"></span>
     <?php
-        require STAFFINC_DIR.'templates/queue-sort.tmpl.php';
+        require STAFFINC_DIR.'templates/tasks-queue-sort.tmpl.php';
     ?>
    </div>
     <form action="tasks.php" method="get" onsubmit="javascript:
diff --git a/include/staff/templates/tasks-queue-sort.tmpl.php b/include/staff/templates/tasks-queue-sort.tmpl.php
new file mode 100644
index 0000000000000000000000000000000000000000..c0156fddd8b17148c67657d193a4f2a02080e521
--- /dev/null
+++ b/include/staff/templates/tasks-queue-sort.tmpl.php
@@ -0,0 +1,33 @@
+
+<span class="action-button muted" data-dropdown="#sort-dropdown" data-toggle="tooltip" title="<?php echo $sort_options[$sort_cols]; ?>">
+  <i class="icon-caret-down pull-right"></i>
+  <span><i class="icon-sort-by-attributes-alt <?php if ($sort_dir) echo 'icon-flip-vertical'; ?>"></i> <?php echo __('Sort');?></span>
+</span>
+<div id="sort-dropdown" class="action-dropdown anchor-right"
+onclick="javascript:
+var query = addSearchParam({'sort': $(event.target).data('mode'), 'dir': $(event.target).data('dir')});
+$.pjax({
+    url: '?' + query,
+    timeout: 2000,
+    container: '#pjax-container'});">
+  <ul class="bleed-left">
+    <?php foreach ($queue_sort_options as $mode) {
+    $desc = $sort_options[$mode];
+    $icon = '';
+    $dir = '0';
+    $selected = $sort_cols == $mode; ?>
+    <li <?php
+    if ($selected) {
+    echo 'class="active"';
+    $dir = ($sort_dir == '1') ? '0' : '1'; // Flip the direction
+    $icon = ($sort_dir == '1') ? 'icon-hand-up' : 'icon-hand-down';
+    }
+    ?>>
+        <a href="#" data-mode="<?php echo $mode; ?>" data-dir="<?php echo $dir; ?>">
+          <i class="icon-fixed-width <?php echo $icon; ?>"
+          ></i> <?php echo Format::htmlchars($desc); ?></a>
+      </li>
+    <?php } ?>
+ </ul>
+</div>
+