diff --git a/plugins/addressbook/evolution/eds.c b/plugins/addressbook/evolution/eds.c
index 415a94d15..de5ff1a2e 100644
--- a/plugins/addressbook/evolution/eds.c
+++ b/plugins/addressbook/evolution/eds.c
@@ -189,8 +189,9 @@ pixbuf_from_contact(EContact *contact)
 
     e_contact_photo_free(photo);
 
-    if (!pixbuf)
+    if (!pixbuf) {
         return NULL;
+    }
 
     // check size and resize if needed
     gint width = gdk_pixbuf_get_width(pixbuf);
@@ -454,11 +455,6 @@ determine_default_addressbook()
 void
 search_async_by_contacts(const char *query, int max_results, SearchAsyncHandler handler, gpointer user_data)
 {
-    if (!*query) {
-        handler(NULL, user_data);
-        return;
-    }
-
     Search_Handler_And_Data *had = g_new0(Search_Handler_And_Data, 1);
 
     // initialize search data
@@ -466,7 +462,11 @@ search_async_by_contacts(const char *query, int max_results, SearchAsyncHandler
     had->user_data = user_data;
     had->hits = NULL;
     had->max_results_remaining = max_results;
-    had->equery = create_query(query, current_test, (AddressBook_Config *) (user_data));
+    if (!g_strcmp0(query, ""))
+        had->equery = e_book_query_any_field_contains("");
+    else
+        had->equery = create_query(query, current_test, (AddressBook_Config *) (user_data));
+
 
 #if EDS_CHECK_VERSION(3,5,3)
     ESourceRegistry *registry = get_registry();
diff --git a/plugins/addressbook/test/test_addressbook.c b/plugins/addressbook/test/test_addressbook.c
index 8b3953994..78374275c 100644
--- a/plugins/addressbook/test/test_addressbook.c
+++ b/plugins/addressbook/test/test_addressbook.c
@@ -89,10 +89,11 @@ main(int argc, char *argv[])
     g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
 
     addressbook_init();
+    addressbook_set_current_book("Contacts");
 
     GtkWidget *entry = gtk_entry_new();
-    //gtk_container_add(GTK_CONTAINER(vbox), entry);
     gtk_container_add(GTK_CONTAINER(vbox), tree_view);
+    gtk_container_add(GTK_CONTAINER(vbox), entry);
     gtk_container_add(GTK_CONTAINER(window), vbox);
 
     addressbook_search(handler_async_search, GTK_ENTRY(entry), NULL);