diff --git a/include/ajax.tickets.php b/include/ajax.tickets.php
index d1df0f6ca276af5b03b16b8770794ea18577b11a..56093119ba4db6369ddac398dac11470a7f5d4e4 100644
--- a/include/ajax.tickets.php
+++ b/include/ajax.tickets.php
@@ -112,6 +112,9 @@ class TicketsAjaxAPI extends AjaxController {
             case 'open':
                 $where.=' AND ticket.status="open" ';
                 break;
+            case 'answered':
+                $where.=' AND ticket.status="open" AND ticket.isanswered=1 ';
+                break;
             case 'overdue':
                 $where.=' AND ticket.status="open" AND ticket.isoverdue=1 ';
                 break;
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index f13c22a0c104e81c492c12e715322d9c5bfe5222..64cd52cc7e6fcd215b3340f629eef3a7fdff5666 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -555,6 +555,11 @@ $negorder=$order=='DESC'?'ASC':'DESC'; //Negate the sorting..
             <select id="status" name="status">
                 <option value="">&mdash; Any Status &mdash;</option>
                 <option value="open">Open</option>
+                <?php
+                if(!$cfg->showAnsweredTickets()) {?>
+                <option value="answered">Answered</option>
+                <?php
+                } ?>
                 <option value="overdue">Overdue</option>
                 <option value="closed">Closed</option>
             </select>
diff --git a/scp/js/scp.js b/scp/js/scp.js
index cf32e42d8b638ff1b465cb23eb9a196e72be31ba..8ce35149ee3909130fa8d1a42ff202246ccb8981 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -369,6 +369,7 @@ $(document).ready(function(){
                 break;
             case 'open':
             case 'overdue':
+            case 'answered':
                 $('select#staffId').find('option:first').attr('selected', 'selected').parent('select');
                 $('select#staffId').attr('disabled','disabled');
                 $('select#assignee').removeAttr('disabled');