diff --git a/ChangeLog b/ChangeLog
index 2003f6f65..b8af63da7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-10-07  Gary Burton <gary.burton@zen.co.uk>
+	* src/PageView.py: sort column retains filter value, issue #507
+
 2007-10-06  Douglas Blank  <dblank@cs.brynmawr.edu>
 	* src/plugins/Calendar.py: various improvements
 
diff --git a/src/PageView.py b/src/PageView.py
index e3a8a9734..3e57d8a42 100644
--- a/src/PageView.py
+++ b/src/PageView.py
@@ -52,8 +52,6 @@ import const
 NAVIGATION_NONE   = -1
 NAVIGATION_PERSON = 0
 
-EMPTY_SEARCH = (0, '', False)
-
 #----------------------------------------------------------------
 #
 # PageView
@@ -670,7 +668,7 @@ class ListView(BookMarkView):
         handle = self.first_selected()
 
         if Config.get(Config.FILTER):
-            search = EMPTY_SEARCH
+            search = (True, self.generic_filter)
         else:
             search = (False,self.search_bar.get_value())
 
@@ -762,7 +760,7 @@ class ListView(BookMarkView):
             db.connect(sig, self.signal_map[sig])
 
 #        if Config.get(Config.FILTER):
-#            search = EMPTY_SEARCH
+#            search = (True, self.generic_filter)
 #        else:
 #            search = self.search_bar.get_value()
 #        self.model = self.make_model(self.dbstate.db, 0, search=search)