diff --git a/ChangeLog b/ChangeLog
index 4c9ad61c7..3df041cbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
         * fixed small leak in e_import_dialog_show during failure case
         * fixed small leak in illume2 policy config
         * fixed path setting in import dialog
+        * fixed possible NULL deref in desktop editor
 
 2013-01-22 Mike Blumenkrantz
 
diff --git a/NEWS b/NEWS
index cdeeb55fd..b0ca10e0a 100644
--- a/NEWS
+++ b/NEWS
@@ -118,3 +118,4 @@ Fixes:
     * fixed small leak in e_import_dialog_show during failure case
     * fixed small leak in illume2 policy config
     * fixed path setting in import dialog
+    * fixed possible NULL deref in desktop editor
diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c
index 3ea3ac901..f003511e2 100644
--- a/src/bin/e_eap_editor.c
+++ b/src/bin/e_eap_editor.c
@@ -143,7 +143,7 @@ e_desktop_border_create(E_Border *bd)
          */
         char file[PATH_MAX];
 
-        snprintf(file, sizeof(file), "%s-%.6f.png", bname, ecore_time_get());
+        snprintf(file, sizeof(file), "%s-%.6f.png", bname ?: "", ecore_time_get());
         snprintf(path, sizeof(path), "%s/%s", icon_dir, file);
         if (e_util_icon_save(&(bd->client.netwm.icons[0]), path))
           desktop->icon = strdup(file);