diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c
index 1c7bd976f..fca3a9190 100644
--- a/src/bin/e_apps.c
+++ b/src/bin/e_apps.c
@@ -2698,7 +2698,7 @@ _e_app_is_eapp(const char *path)
      return 0;
 
    p++;
-   if (strcasecmp(p, "desktop"))
+   if ((strcasecmp(p, "desktop") != 0) && (strcasecmp(p, "desktop") != 0))
      return 0;
 
    return 1;
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 2e58b2096..d835990bf 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -1393,7 +1393,7 @@ _e_fm2_icon_new(E_Fm2_Smart_Data *sd, char *file)
 	if (mime) ic->info.mime = evas_stringshare_add(mime);
      }
    
-   if (e_util_glob_case_match(ic->info.file, "*.desktop"))
+   if ((e_util_glob_case_match(ic->info.file, "*.desktop")) || (e_util_glob_case_match(ic->info.file, "*.directory")))
      _e_fm2_icon_desktop_load(ic);
    evas_event_freeze(evas_object_evas_get(sd->obj));
    edje_freeze();
@@ -1809,9 +1809,7 @@ _e_fm2_icon_icon_direct_set(E_Fm2_Icon *ic, Evas_Object *o, void (*gen_func) (vo
 						 gen_func, data);
 		  _e_fm2_icon_thumb(ic, oic, force_gen);
 	       }
-	     else if (
-		      (e_util_glob_case_match(ic->info.file, "*.desktop"))
-		      )
+	     else if ((e_util_glob_case_match(ic->info.file, "*.desktop")) || (e_util_glob_case_match(ic->info.file, "*.directory")))
 	       {
 		  E_App *app;
 		  
diff --git a/src/bin/e_thumb_main.c b/src/bin/e_thumb_main.c
index 76bc1b229..9588059b0 100644
--- a/src/bin/e_thumb_main.c
+++ b/src/bin/e_thumb_main.c
@@ -336,7 +336,7 @@ _e_thumb_generate(E_Thumb *eth)
 	alpha = 1;
 	ext = strrchr(eth->file, '.');
 
-	if ((ext) && (!strcasecmp(ext, ".desktop")))
+	if ( (ext) && ((!strcasecmp(ext, ".desktop")) || (!strcasecmp(ext, ".directory"))) )
 	  {
 	     Ecore_Desktop *desktop;