diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 4620b6b59..192094ea8 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -2555,7 +2555,8 @@ e_border_icon_add(E_Border *bd, Evas *evas)
 		}
 	     else
 	        {
-	           if (!strcmp(bd->internal_icon + strlen(bd->internal_icon) - 4, ".eap")) 
+	           if ((!strcmp(bd->internal_icon + strlen(bd->internal_icon) - 4, ".eap"))
+	           || (!strcmp(bd->internal_icon + strlen(bd->internal_icon) - 4, ".edj")))
 	             {
 		        if (!edje_object_file_set(o, bd->internal_icon, "icon"))
 		          e_util_edje_icon_set(o, "enlightenment/e");