diff --git a/capplets/url-properties/ChangeLog b/capplets/url-properties/ChangeLog
index 54b2a7cae..df229f4fd 100644
--- a/capplets/url-properties/ChangeLog
+++ b/capplets/url-properties/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-17  Bradford Hovinen  <hovinen@ximian.com>
+
+	* url-properties.c: Make sure the row is unselected before trying
+	to remove it
+
 2001-10-16  Jakub Steiner <jimmac@ximian.com>
 
 	* url-capplet.png: changed the icon based on usability@ notes
diff --git a/capplets/url-properties/url-properties.c b/capplets/url-properties/url-properties.c
index f6296d0d5..c9113d1f9 100644
--- a/capplets/url-properties/url-properties.c
+++ b/capplets/url-properties/url-properties.c
@@ -268,6 +268,7 @@ void remove_handler(GtkButton *button) {
   for (row = 0; row < num_rows; row++) {
     gtk_clist_get_text(GTK_CLIST(clist), row, 0, &col1);
     if (!g_strcasecmp(prot, col1)) {
+      gtk_clist_unselect_row(GTK_CLIST(clist), row, 0);
       gtk_clist_remove(GTK_CLIST(clist), row);
       capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);
       gtk_entry_set_text(GTK_ENTRY(protocol), "");