diff --git a/include/staff/tasks.inc.php b/include/staff/tasks.inc.php
index d908312bda49ebf96e3f6b16174cebcd99332f66..49cdd5e22ac9ece74a17b58a9c7f6d3a8c1ecaa9 100644
--- a/include/staff/tasks.inc.php
+++ b/include/staff/tasks.inc.php
@@ -168,7 +168,8 @@ default:
 
 // Apply requested pagination
 $page=($_GET['p'] && is_numeric($_GET['p']))?$_GET['p']:1;
-$pageNav=new Pagenate($tasks->count(), $page, PAGE_LIMIT);
+$count = $tasks->count();
+$pageNav=new Pagenate($count, $page, PAGE_LIMIT);
 $pageNav->setURL('tasks.php', $args);
 $tasks = $pageNav->paginate($tasks);
 
@@ -262,7 +263,8 @@ return false;">
         </div>
         <div class="pull-right flush-right">
            <?php
-            Task::getAgentActions($thisstaff, array('status' => $status));
+           if ($count)
+                echo Task::getAgentActions($thisstaff, array('status' => $status));
             ?>
         </div>
     </div>
diff --git a/include/staff/ticket-tasks.inc.php b/include/staff/ticket-tasks.inc.php
index 9085ab239b3bf51c72d6141558dd53eddf4a4041..7c2ece1ad34bf5cdc1e838872283fbd4a639b4fc 100644
--- a/include/staff/ticket-tasks.inc.php
+++ b/include/staff/ticket-tasks.inc.php
@@ -40,7 +40,8 @@ $showing = $pageNav->showing().' '._N('task', 'tasks', $count);
             print __('Add New Task'); ?></a>
     <?php
     }
-    Task::getAgentActions($thisstaff, array('morelabel' => __('Options')));
+    if ($count)
+        Task::getAgentActions($thisstaff, array('morelabel' => __('Options')));
     ?>
 </div>
 <div class="clear"></div>
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index 270f1e287cb6d43a5d25d4fe74ea9a38464459b8..73554b33a5ef91d3fb7ac7153335adcc5c9796ac 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -187,7 +187,8 @@ if (!$view_all_tickets) {
 
 // Apply requested pagination
 $page=($_GET['p'] && is_numeric($_GET['p']))?$_GET['p']:1;
-$pageNav = new Pagenate($tickets->count(), $page, PAGE_LIMIT);
+$count = $tickets->count();
+$pageNav = new Pagenate($count, $page, PAGE_LIMIT);
 $pageNav->setURL('tickets.php', $args);
 $tickets = $pageNav->paginate($tickets);
 
@@ -367,15 +368,17 @@ return false;">
         </div>
         <div class="pull-right flush-right">
             <?php
-            if ($thisstaff->canManageTickets()) {
-                echo TicketStatus::status_options();
-            }
-            if ($thisstaff->hasPerm(TicketModel::PERM_DELETE, false)) { ?>
-            <a id="tickets-delete" class="red button action-button tickets-action"
-                href="#tickets/status/delete"><i
-            class="icon-trash"></i> <?php echo __('Delete'); ?></a>
-            <?php
-            } ?>
+            if ($count) {
+                if ($thisstaff->canManageTickets()) {
+                    echo TicketStatus::status_options();
+                }
+                if ($thisstaff->hasPerm(TicketModel::PERM_DELETE, false)) { ?>
+                <a id="tickets-delete" class="red button action-button tickets-action"
+                    href="#tickets/status/delete"><i
+                class="icon-trash"></i> <?php echo __('Delete'); ?></a>
+                <?php
+                }
+            }?>
         </div>
     </div>
 </div>