diff --git a/src/modules/conf_theme/e_int_config_borders.c b/src/modules/conf_theme/e_int_config_borders.c
index d8239642f..cac3c7681 100644
--- a/src/modules/conf_theme/e_int_config_borders.c
+++ b/src/modules/conf_theme/e_int_config_borders.c
@@ -13,7 +13,6 @@ static void                  _basic_apply_border(E_Config_Dialog_Data *cfdata);
 struct _E_Config_Dialog_Data
 {
    E_Client *client;
-   E_Comp *comp;
    const char  *bordername;
    int          remember_border;
 };
@@ -76,11 +75,8 @@ _create_data(E_Config_Dialog *cfd)
    E_Config_Dialog_Data *cfdata;
 
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
-   cfdata->comp = NULL;
    cfdata->client = NULL;
-   if (!cfd->data)
-     cfdata->comp = e_comp;
-   else
+   if (cfd->data)
      cfdata->client = cfd->data;
 
    _fill_data(cfdata);
@@ -133,12 +129,12 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 {
    if (cfdata->client)
      _basic_apply_border(cfdata);
-   else if (cfdata->comp)
+   else
      {
         Eina_List *l;
         E_Client *ec;
         eina_stringshare_replace(&e_config->theme_default_border_style, cfdata->bordername);
-        EINA_LIST_FOREACH(cfdata->comp->clients, l, ec)
+        EINA_LIST_FOREACH(e_comp->clients, l, ec)
           {
              if (e_client_util_ignored_get(ec)) continue;
              EC_CHANGED(ec);
diff --git a/src/modules/conf_theme/e_int_config_wallpaper.c b/src/modules/conf_theme/e_int_config_wallpaper.c
index ccfc880d9..f736d7aa8 100644
--- a/src/modules/conf_theme/e_int_config_wallpaper.c
+++ b/src/modules/conf_theme/e_int_config_wallpaper.c
@@ -338,15 +338,13 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    else
      {
         /* get current desk. advanced mode allows selecting all, screen or desk */
-        E_Comp *comp;
         E_Zone *zone;
         E_Desk *desk;
 
-        comp = e_manager_current_get()->comp;
         zone = e_zone_current_get();
         desk = e_desk_current_get(zone);
 
-        cfbg = e_bg_config_get(comp->num, zone->num, desk->x, desk->y);
+        cfbg = e_bg_config_get(e_comp->num, zone->num, desk->x, desk->y);
         /* if we have a config for this bg, use it. */
         if (cfbg)
           {