diff --git a/RIGS/finance.py b/RIGS/finance.py
index 73552f2e..4674e5dd 100644
--- a/RIGS/finance.py
+++ b/RIGS/finance.py
@@ -11,6 +11,7 @@ from django.shortcuts import get_object_or_404
 from django.contrib import messages
 import datetime
 from z3c.rml import rml2pdf
+from django.db.models import Q
 
 from RIGS import models
 
@@ -87,6 +88,36 @@ class InvoiceVoid(generic.View):
 class InvoiceArchive(generic.ListView):
     model = models.Invoice
     paginate_by = 25
+    template_name="RIGS/invoice_archive.html"
+
+    def get_queryset(self):
+        q = self.request.GET.get('q', "")
+        
+        filter = Q(event__name__icontains=q)
+
+        #try and parse an int
+        try:
+            val = int(q)
+            filter = filter | Q(pk=val)
+            filter = filter | Q(event__pk=val)
+        except:
+            #not an integer
+            pass
+
+        try:
+            if q[0] == "N":
+                val = int(q[1:])
+                filter = Q(event__pk=val) #If string is Nxxxxx then filter by event number
+            elif q[0] == "#":
+                val = int(q[1:])
+                filter = Q(pk=val) #If string is #xxxxx then filter by invoice number
+
+        except:
+            pass
+            
+        object_list = self.model.objects.filter(filter)
+
+        return object_list
 
 
 class InvoiceWaiting(generic.ListView):
diff --git a/RIGS/templates/RIGS/invoice_archive.html b/RIGS/templates/RIGS/invoice_archive.html
new file mode 100644
index 00000000..2860254b
--- /dev/null
+++ b/RIGS/templates/RIGS/invoice_archive.html
@@ -0,0 +1,12 @@
+{% extends 'RIGS/invoice_list.html' %}
+
+{% block search %}
+	<div class="col-sm-3 col-sm-offset-9">
+		<form class="form form-horizontal col-sm-12">
+		    <div class="form-group">
+		        <input type="search" name="q" placeholder="Search" value="{{ request.GET.q }}"
+		               class="form-control"/>
+		    </div>
+		</form>
+	</div>
+{% endblock %}
\ No newline at end of file
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index bf9fe31f..98da7645 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -6,6 +6,8 @@
 {% block content %}
     <div class="col-sm-12">
         <h2>Invoices</h2>
+        {% block search %}
+        {% endblock %}
         {% if is_paginated %}
             <div class="col-md-6 col-md-offset-6 col-sm-12 text-right">
                 {% paginator %}