diff --git a/src/bin/e_int_config_theme_import.c b/src/bin/e_int_config_theme_import.c
index 7ead7b636..2592213d2 100644
--- a/src/bin/e_int_config_theme_import.c
+++ b/src/bin/e_int_config_theme_import.c
@@ -236,7 +236,6 @@ _theme_import_cb_ok(void *data, void *data2)
 {
    Import *import;
    E_Win *win;
-   Evas_Object *o;
    const char *path;
    const char *file;
    char *homedir;
@@ -266,12 +265,8 @@ _theme_import_cb_ok(void *data, void *data2)
 	if (!e_util_glob_case_match(file, "*.edj")) 
 	  return;
 
-	o = edje_object_add(e_win_evas_get(win));
-	is_theme = (edje_object_file_set(o, import->cfdata->file,
-					 "e/widgets/border/default/border"));
-	evas_object_del(o);
-
-	if (!is_theme)
+	if (!edje_file_group_exists(import->cfdata->file, 
+				    "e/widgets/border/default/border"))
 	  {
 	     e_util_dialog_show(_("Theme Import Error"),
 				_("Enlightenment was unable to import "
diff --git a/src/bin/e_int_config_wallpaper_import.c b/src/bin/e_int_config_wallpaper_import.c
index 8151bbe5c..c0b201fc4 100644
--- a/src/bin/e_int_config_wallpaper_import.c
+++ b/src/bin/e_int_config_wallpaper_import.c
@@ -525,16 +525,12 @@ _import_cb_ok(void *data, void *data2)
 	     snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds/%s", 
 		      homedir, file);
 	     E_FREE(homedir);
-
-	     Evas_Object *o;
 	     
-	     o = edje_object_add(e_win_evas_get(import->win));
-	     is_bg = (edje_object_file_set(o, import->cfdata->file, 
-					   "e/desktop/background"));
+	     is_bg = edje_file_group_exists(import->cfdata->file, 
+					    "e/desktop/background");
 	     is_theme = 
-	       (edje_object_file_set(o, import->cfdata->file, 
-				     "e/widgets/border/default/border"));
-	     evas_object_del(o);
+	       edje_file_group_exists(import->cfdata->file, 
+				      "e/widgets/border/default/border");
 	     
 	     if ((is_bg) && (!is_theme)) 
 	       {