Index: src/bookmarks/ephy-bookmark-properties.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/bookmarks/ephy-bookmark-properties.c,v
retrieving revision 1.13
diff -u -p -r1.13 ephy-bookmark-properties.c
--- src/bookmarks/ephy-bookmark-properties.c	25 Apr 2003 18:46:54 -0000	1.13
+++ src/bookmarks/ephy-bookmark-properties.c	25 Apr 2003 23:02:23 -0000
@@ -319,6 +319,7 @@ build_ui (EphyBookmarkProperties *editor
 	char *str;
 	const char *tmp;
 	gboolean state;
+	gchar *tmpid;
 	gulong id;
 
 	g_signal_connect (G_OBJECT (editor),
@@ -326,9 +327,15 @@ build_ui (EphyBookmarkProperties *editor
 			  G_CALLBACK (bookmark_properties_response_cb),
 			  editor);
 
+	/* Each property window has its own state node.
+	 * We use the node_id to save state info as it is unique. 
+	 */	
+	id = ephy_node_get_id (editor->priv->bookmark);
+	tmpid = g_strdup_printf ("Bookmarks Properties #%ld", id);
 	ephy_state_add_window (GTK_WIDGET(editor),
-			       "bookmark_properties",
+			       tmpid,
 		               290, 280);
+	g_free (tmpid);
 
 	update_window_title (editor);
 	set_window_icon (editor);
@@ -406,7 +413,7 @@ build_ui (EphyBookmarkProperties *editor
 			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
 	checkbox = gtk_check_button_new_with_mnemonic (_("_Show in the bookmarks toolbar"));
-	id = ephy_node_get_id (editor->priv->bookmark);
+
 	state = ephy_toolbars_model_has_bookmark (editor->priv->tb_model, FALSE, id);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), state);
 	g_signal_connect (checkbox, "toggled",
