diff --git a/ChangeLog b/ChangeLog
index f61d441..4397d19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-13	Jannis Pohlmann <jannis@xfce.org>
+
+	* settings/xfae-window.c: Fix a crash in xfce4-session-settings when 
+	  trying to add a new autostarted application. XfaeWindow is no longer
+	  a GtkWindow and can thus not be used as a parent in 
+	  gtk_window_set_transient_for() any more.
+
 2009-02-01	Brian Tarricone <bjt23@cornell.edu>
 
 	* xfce4-session/xfsm-shutdown-helper.c: Fix sudo shutdown helper;
diff --git a/settings/xfae-window.c b/settings/xfae-window.c
index 127b8ac..0426c7d 100644
--- a/settings/xfae-window.c
+++ b/settings/xfae-window.c
@@ -257,6 +257,7 @@ static void
 xfae_window_add (XfaeWindow *window)
 {
   GtkTreeModel *model;
+  GtkWidget    *parent;
   GtkWidget    *dialog;
   GError       *error = NULL;
   gchar        *name;
@@ -264,7 +265,8 @@ xfae_window_add (XfaeWindow *window)
   gchar        *command;
 
   dialog = xfae_dialog_new ();
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
+  parent = gtk_widget_get_toplevel (GTK_WIDGET (window));
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
   if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
     {
       gtk_widget_hide (dialog);