diff --git a/gio/ChangeLog b/gio/ChangeLog
index 07d410443..48f9fe8ab 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-09  Padraig O'Briain  <padraig.obriain@sun.com>
+
+        * gdesktopappinfo.c: In g_app_info_create_from_commandline set comment
+        after name. Fixes #527132.
+
 2008-04-08  Tomas Bzatek  <tbzatek@redhat.com> 
 
         * gfile.c: (g_file_replace):
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index b6c7c5b22..c43f040cd 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -1514,7 +1514,6 @@ g_app_info_create_from_commandline (const char           *commandline,
     info->exec = g_strconcat (commandline, " %u", NULL);
   else
     info->exec = g_strconcat (commandline, " %f", NULL);
-  info->comment = g_strdup_printf (_("Custom definition for %s"), info->name);
   info->nodisplay = TRUE;
   info->binary = binary_from_exec (info->exec);
   
@@ -1530,6 +1529,7 @@ g_app_info_create_from_commandline (const char           *commandline,
       if (info->name == NULL)
 	info->name = g_strdup ("custom");
     }
+  info->comment = g_strdup_printf (_("Custom definition for %s"), info->name);
   
   return G_APP_INFO (info);
 }