diff --git a/xqf/ChangeLog b/xqf/ChangeLog
index b398fa5..11f7bf9 100644
--- a/xqf/ChangeLog
+++ b/xqf/ChangeLog
@@ -1,3 +1,7 @@
+Aug 16, 2004: Ludwig Nussel <l-n@users.sourceforge.net>
+- Fix quickfilter not working when pressing backspace or delete in the empty
+  textentry (thanks Ruediger Meier for spotting this one).
+
 Aug 15, 2004: Ludwig Nussel <l-n@users.sourceforge.net>
 - Fix compile with gcc 2.95 (patch by Thomas Zajic)
 - Fix --add when one server without type is specified whose port matches
diff --git a/xqf/src/xqf.c b/xqf/src/xqf.c
index cc7749d..145473c 100644
--- a/xqf/src/xqf.c
+++ b/xqf/src/xqf.c
@@ -3250,9 +3250,14 @@ static void quick_filter_entry_changed(GtkWidget* entry, gpointer data)
   const char* text = gtk_entry_get_text(GTK_ENTRY(entry));
   int mask = 0;
 
+  debug(3,"%d <%s>", strlen(text), text);
+
   if(!text || !*text)
   {
-    mask = FILTER_QUICK_MASK;
+    if(filter_quick_get())
+    {
+      mask = FILTER_QUICK_MASK;
+    }
     filter_quick_set(NULL);
   }
   else