diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html
index 491e242b..17d1f354 100644
--- a/helpdesk/templates/helpdesk/ticket_list.html
+++ b/helpdesk/templates/helpdesk/ticket_list.html
@@ -130,6 +130,9 @@ $(document).ready(function() {
     </div>
     <hr style='clear: both;' />
     <input type='submit' value='{% trans "Apply Filter" %}' />
+    {% if from_saved_query and saved_query.user = user %}
+    <p>{% blocktrans with saved_query.title as query_name %}You are currently viewing saved query <em>{{ query_name }}</em>.{% endblocktrans %} <a href='{% url helpdesk_delete_query saved_query.id %}'>{% trans "Delete Saved Query" %}</a></p>
+    {% endif %}
     {% csrf_token %}</form>
     </div>
     
diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index ec0c8f7e..d8c46eec 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -513,6 +513,7 @@ def ticket_list(request):
                 # Go on to standard keyword searching
                 pass
 
+    saved_query = None
     if request.GET.get('saved_query', None):
         from_saved_query = True
         try:
@@ -634,6 +635,7 @@ def ticket_list(request):
             user_saved_queries=user_saved_queries,
             query_params=query_params,
             from_saved_query=from_saved_query,
+            saved_query=saved_query,
             search_message=search_message,
             tags_enabled=HAS_TAG_SUPPORT
         )))