diff --git a/legacy/efreet/src/lib/efreet_cache.c b/legacy/efreet/src/lib/efreet_cache.c
index 643b2f53c0..3d9b838f10 100644
--- a/legacy/efreet/src/lib/efreet_cache.c
+++ b/legacy/efreet/src/lib/efreet_cache.c
@@ -685,12 +685,6 @@ efreet_cache_icon_theme_name_list(int *num)
             memmove(&keys[i], &keys[i + 1], (*num - i - 1) * sizeof(char *));
             (*num)--;
         }
-        /* this fixes segv of e's icon theme chooser. FIXME is this a not intended case?*/
-        else if (!strncmp(keys[i], "efreet", 6) && (i < (*num + 1)))
-        {
-             memmove(&keys[i], &keys[i + 1], (*num - i - 1) * sizeof(char *));
-             (*num)--;
-        }
     }
     return keys;
 }
diff --git a/legacy/efreet/src/lib/efreet_icon.c b/legacy/efreet/src/lib/efreet_icon.c
index 722ec347fa..81b0f6778d 100644
--- a/legacy/efreet/src/lib/efreet_icon.c
+++ b/legacy/efreet/src/lib/efreet_icon.c
@@ -237,7 +237,8 @@ efreet_icon_theme_list_get(void)
             Efreet_Icon_Theme *theme;
 
             theme = efreet_icon_theme_find(keys[i]);
-            list = eina_list_append(list, theme);
+            if (theme)
+                list = eina_list_append(list, theme);
         }
         free(keys);
     }