diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 8e38ef89de..94604fb83e 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-21  Christopher James Lahey  <clahey@ximian.com>
+
+	* gui/widgets/e-addressbook-reflow-adapter.c
+	(model_and_selection_free): right_click_up here when we let go of
+	the popup.
+
 2001-10-21  Christopher James Lahey  <clahey@ximian.com>
 
 	* gui/component/select-names/e-select-names.c
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 3c3f716c63..66f21dbc9d 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -100,6 +100,7 @@ static void
 model_and_selection_free (ModelAndSelection *mns)
 {
 	gtk_object_unref(GTK_OBJECT(mns->adapter));
+	e_selection_model_right_click_up(mns->selection);
 	gtk_object_unref(GTK_OBJECT(mns->selection));
 	g_free(mns);
 }
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 70e873f9e2..fa1f2bbced 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -301,6 +301,8 @@ e_minicard_view_selection_event (EReflow *reflow, GnomeCanvasItem *item, GdkEven
 	case GDK_BUTTON_PRESS:
 		if (event->button.button == 3) {
 			return_val = e_addressbook_reflow_adapter_right_click (view->adapter, event, reflow->selection);
+			if (!return_val)
+				e_selection_model_right_click_up(E_SELECTION_MODEL (view->selection));
 		}
 		break;
 	default: