diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index 648140c2d..efd866a8f 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -412,9 +412,9 @@ e_hints_window_init(E_Border *bd)
      {
 	char *str = NULL;
 	
-	if (
-	    (ecore_x_netwm_startup_id_get(bd->client.win, &str) && (str)) ||
-	    ((bd->client.icccm.client_leader > 0) && ecore_x_netwm_startup_id_get(bd->client.icccm.client_leader, &str) && (str))
+	if ((ecore_x_netwm_startup_id_get(bd->client.win, &str) && (str)) ||
+	    ((bd->client.icccm.client_leader > 0) && 
+	     ecore_x_netwm_startup_id_get(bd->client.icccm.client_leader, &str) && (str))
 	    )
 	  {
 	     if (!strncmp(str, "E_START|", 8))
diff --git a/src/bin/e_thumb.c b/src/bin/e_thumb.c
index dac2edd99..5f247cbaf 100644
--- a/src/bin/e_thumb.c
+++ b/src/bin/e_thumb.c
@@ -66,6 +66,9 @@ e_thumb_shutdown(void)
 	event_handlers = evas_list_remove_list(event_handlers, event_handlers);
      }
    evas_list_free(thumb_files);
+
+   if (pid != -1)
+     kill(pid, SIGTERM);
    
    return 1;
 }
@@ -587,7 +590,11 @@ _e_thumb_cb_exe_exit(void *data, int type, void *event)
    
    ev = event;
    if (ev->pid != pid) return 1;
-   if (!thumb_files) return 1;
+   if (!thumb_files)
+     {
+        pid = -1;
+        return 1;
+     }
    
    t = thumb_files->data;
    thumb_files = evas_list_remove_list(thumb_files, thumb_files);