diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c
index f1f7bd730..3d1e86d4f 100644
--- a/src/bin/e_eap_editor.c
+++ b/src/bin/e_eap_editor.c
@@ -74,7 +74,26 @@ e_desktop_border_create(E_Border *bd)
 	desktop = efreet_desktop_empty_new(path);
      }
    else
-     desktop = efreet_desktop_empty_new(NULL);
+     {
+        int i;
+	
+	for (i = 1; i < 65536; i++)
+	  {
+	     snprintf(path, sizeof(path), "%s/_new_app-%i.desktop",
+		      desktop_dir, i);
+	     if (!ecore_file_exists(path))
+	       {
+		  desktop = efreet_desktop_empty_new(path);
+		  break;
+	       }
+	  }
+	if (!desktop)
+	  {
+	     snprintf(path, sizeof(path), "%s/_rename_me-%i.desktop",
+		      desktop_dir, (int)ecore_time_get());
+	     desktop = efreet_desktop_empty_new(NULL);
+	  }
+     }
 
    if (!desktop)
      {
diff --git a/src/bin/e_int_config_apps_order.c b/src/bin/e_int_config_apps_order.c
index 1724f72bd..875af2f76 100644
--- a/src/bin/e_int_config_apps_order.c
+++ b/src/bin/e_int_config_apps_order.c
@@ -49,7 +49,12 @@ EAPI E_Config_Dialog *
 		  break;
 	       }
 	  }
-	if (!de) de = efreet_desktop_empty_new(NULL);
+	if (!de)
+	  {
+	     snprintf(path, sizeof(path), "%s/_rename_me-%i.desktop",
+		      desktop_dir, (int)ecore_time_get());
+	     de = efreet_desktop_empty_new(NULL);
+	  }
      }
    else
      de = efreet_desktop_empty_new(NULL);