diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c
index a35599d73..13f54fea4 100644
--- a/src/bin/e_int_border_menu.c
+++ b/src/bin/e_int_border_menu.c
@@ -559,8 +559,15 @@ _e_border_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item *mi)
      {
 	if (bname) 
 	  {
-	     snprintf(path, sizeof(path), "%s/.e/e/applications/all/%s.desktop", getenv("HOME"), bname);
-	     a = e_app_empty_new(path);
+	     char *homedir;
+
+	     homedir = e_user_homedir_get();
+	     if (homedir)
+	       {
+		  snprintf(path, sizeof(path), "%s/.e/e/applications/all/%s.desktop", homedir, bname);
+		  free(homedir);
+		  a = e_app_empty_new(path);
+	       }
 	  }
 	else
 	  a = e_app_empty_new(NULL);