4 files changed, 13 insertions, 5 deletions
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index fcf1cd23e..0d1cb0c94 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -386,7 +386,8 @@ ephy_bookmark_properties_init (EphyBookmarkProperties *editor)
 
 GtkWidget *
 ephy_bookmark_properties_new (EphyBookmarks *bookmarks,
-			      EphyNode *bookmark)
+			      EphyNode *bookmark,
+			      GtkWindow *parent_window)
 {
 	EphyBookmarkProperties *editor;
 
@@ -398,7 +399,11 @@ ephy_bookmark_properties_new (EphyBookmarks *bookmarks,
 			 "bookmark", bookmark,
 			 NULL));
 
-	build_ui (editor);
-
+	build_ui (editor);	
+	
+	if (parent_window)
+	{
+		gtk_window_set_transient_for (GTK_WINDOW (editor), parent_window);
+	}
 	return GTK_WIDGET (editor);
 }
diff --git a/src/bookmarks/ephy-bookmark-properties.h b/src/bookmarks/ephy-bookmark-properties.h
index 1790259ca..cd7c23a2f 100644
--- a/src/bookmarks/ephy-bookmark-properties.h
+++ b/src/bookmarks/ephy-bookmark-properties.h
@@ -51,7 +51,8 @@ typedef struct
 GType		     ephy_bookmark_properties_get_type        (void);
 
 GtkWidget	    *ephy_bookmark_properties_new             (EphyBookmarks *bookmarks,
-							       EphyNode *bookmark);
+							       EphyNode *bookmark,
+							       GtkWindow *parent_window);
 
 G_END_DECLS
 
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 40027ed1c..e1c8c168d 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -287,7 +287,7 @@ cmd_bookmark_properties (EggAction *action,
 	for (l = selection; l; l = l->next)
 	{
 		EphyNode *node = EPHY_NODE (l->data);
-		dialog = ephy_bookmark_properties_new (editor->priv->bookmarks, node);
+		dialog = ephy_bookmark_properties_new (editor->priv->bookmarks, node, GTK_WINDOW (editor));
 		gtk_widget_show (GTK_WIDGET (dialog));
 	}
 
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index f133e167d..6eb5d7a12 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -183,6 +183,8 @@ ephy_new_bookmark_response_cb (GtkDialog *dialog,
 			ephy_new_bookmark_add (new_bookmark);
 			break;
 	}
+
+	gtk_widget_destroy (GTK_WIDGET (new_bookmark));
 }
 
 static GtkWidget *