diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index 54f90c89b..baa8dac86 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -411,7 +411,6 @@ e_hints_window_init(E_Border *bd)
 
 		  id = atoi(str + 8);
 		  if (id > 0) bd->client.netwm.startup_id = id;
-		  e_util_env_set("DESKTOP_STARTUP_ID", NULL);
 	       }
 	     free(str);
 	  }
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 22a35b751..3964e8e86 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -139,6 +139,8 @@ main(int argc, char **argv)
    if (getenv("NOSTARTUP")) nostartup = 1;
    if (getenv("RESTART")) after_restart = 1;
    
+   if (getenv("DESKTOP_STARTUP_ID")) e_util_env_set("DESKTOP_STARTUP_ID", NULL);
+   
    e_util_env_set("RESTART", "1");
 
    e_intl_init();