diff --git a/ChangeLog b/ChangeLog
index 6b2ba978..2e9e79a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
  * src/prefs.c:
    Correctly set the parent widget for the keybinding overwrite
    confirmation dialog.
+ * src/dialog.c:
+   Fix setting the icon for some dialogs if the parent itself is also
+   a dialog.
 
 
 2010-03-05  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
diff --git a/src/dialogs.c b/src/dialogs.c
index 553234d7..d247004c 100644
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -578,7 +578,7 @@ static void show_msgbox_dialog(GtkWidget *dialog, GtkMessageType type, GtkWindow
 			break;
 	}
 	gtk_window_set_title(GTK_WINDOW(dialog), title);
-	if (parent == NULL)
+	if (parent == NULL || GTK_IS_DIALOG(parent))
 	{
 		GdkPixbuf *pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO);
 		gtk_window_set_icon(GTK_WINDOW(dialog), pb);
@@ -1390,7 +1390,7 @@ static gint show_prompt(GtkWidget *parent,
 		GTK_BUTTONS_NONE, "%s", question_text);
 	gtk_widget_set_name(dialog, "GeanyDialog");
 	gtk_window_set_title(GTK_WINDOW(dialog), _("Question"));
-	if (parent == NULL)
+	if (parent == NULL || GTK_IS_DIALOG(parent))
 	{
 		GdkPixbuf *pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO);
 		gtk_window_set_icon(GTK_WINDOW(dialog), pb);