diff --git a/gtk/rgmainwindow.cc b/gtk/rgmainwindow.cc
index dc35dc4d..8442ed0d 100644
--- a/gtk/rgmainwindow.cc
+++ b/gtk/rgmainwindow.cc
@@ -894,6 +894,9 @@ gboolean RGMainWindow::xapianDoIndexUpdate(void *data)
       gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(me->_builder, 
 							  "label_fast_search")),
 			 _("Rebuilding search index"));
+      gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object
+                                          (me->_builder, "toolbar_filter")), FALSE);
+
    }
    return false;
 }
@@ -917,7 +920,7 @@ void RGMainWindow::xapianIndexUpdateFinished(GPid pid, gint status, void* data)
 						     "label_fast_search")),
 		      _("Quick filter"));
    gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object
-                            (me->_builder, "entry_fast_search")), TRUE);
+                            (me->_builder, "toolbar_filter")), TRUE);
    g_spawn_close_pid(pid);
 }
 
@@ -1567,19 +1570,15 @@ void RGMainWindow::buildInterface()
 
    // only enable fast search if its usable
 #ifdef HAVE_XAPIAN
-   if(!_lister->xapiandatabase() ||
-      !FileExists("/usr/sbin/update-apt-xapian-index")) {
+   if(!FileExists("/usr/sbin/update-apt-xapian-index"))
+#endif
+   {
       gtk_widget_hide(GTK_WIDGET(
             gtk_builder_get_object(_builder, "toolitem_fast_search")));
       gtk_box_set_center_widget(GTK_BOX(
             gtk_builder_get_object(_builder, "hbox_button_toolbar")), NULL);
    }
-#else
-   gtk_widget_hide(GTK_WIDGET(
-         gtk_builder_get_object(_builder, "toolitem_fast_search")));
-   gtk_box_set_center_widget(GTK_BOX(
-         gtk_builder_get_object(_builder, "hbox_button_toolbar")), NULL);
-#endif
+
    // stuff for the non-root mode
    if(getuid() != 0) {
       GtkWidget *menu;