diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 218d3164ca..928468ad2f 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-01  Chris Toshok  <toshok@ximian.com>
+
+	[ fixes bug #25958 ]
+	* gui/component/addressbook.c (alphabet_state_changed): use
+	FULL_NAME in the case where we're untoggling a letter, and... well
+	use FULL_NAME in the other case too - we should never pop up the
+	advanced dialog.
+
 2002-08-01  Chris Toshok  <toshok@ximian.com>
 
 	* gui/component/select-names/e-select-names.h (struct
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 83b4f294ae..5a84addd3e 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -738,10 +738,10 @@ alphabet_state_changed (EAddressbookView *eav, gunichar letter, AddressbookView
 {
 	view->ignore_search_changes = TRUE;
 	if (letter == 0) {
-		e_search_bar_set_item_id (view->search, ESB_ANY);
+		e_search_bar_set_item_id (view->search, ESB_FULL_NAME);
 		e_search_bar_set_text (view->search, "");
 	} else {
-		e_search_bar_set_item_id (view->search, ESB_ADVANCED);
+		e_search_bar_set_item_id (view->search, ESB_FULL_NAME);
 	}
 	view->ignore_search_changes = FALSE;
 }