diff --git a/ChangeLog b/ChangeLog
index 4340095868..20c7f0f3cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkwindow-x11.c (get_default_title): Don't return NULL.
+
 2007-12-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkhandlebox.c: Fix the default values of shadow and 
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index ae4fab0630..452959d05d 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -498,6 +498,8 @@ get_default_title (void)
   title = g_get_application_name ();
   if (!title)
     title = g_get_prgname ();
+  if (!title)
+    title = "";
 
   return title;
 }