diff --git a/src/modules/illume-home/e_mod_config.c b/src/modules/illume-home/e_mod_config.c
index b4671d3b8..3d1142f0c 100644
--- a/src/modules/illume-home/e_mod_config.c
+++ b/src/modules/illume-home/e_mod_config.c
@@ -119,7 +119,7 @@ static void
 _il_home_config_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    il_home_cfg->cfd = NULL;
-   /* win cfg update */
+   il_home_win_cfg_update();
 }
 
 static Evas_Object *
diff --git a/src/modules/illume-home/e_mod_main.c b/src/modules/illume-home/e_mod_main.c
index bd2a86894..a89d6c384 100644
--- a/src/modules/illume-home/e_mod_main.c
+++ b/src/modules/illume-home/e_mod_main.c
@@ -124,6 +124,13 @@ e_modapi_save(E_Module *m)
    return il_home_config_save();
 }
 
+EAPI void 
+il_home_win_cfg_update(void) 
+{
+   _il_home_apps_unpopulate();
+   _il_home_apps_populate();
+}
+
 /* local functions */
 static E_Gadcon_Client *
 _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) 
@@ -356,7 +363,7 @@ _il_home_win_cb_delete(E_Win *win)
    Instance *inst;
 
    if (!(inst = win->data)) return;
-//   _il_home_apps_unpopulate();
+   _il_home_apps_unpopulate();
    e_object_del(E_OBJECT(inst->hwin));
    inst->hwin = NULL;
 }
@@ -575,13 +582,6 @@ _il_home_fmc_set(Evas_Object *obj)
    e_fm2_config_set(obj, &fmc);
 }
 
-void 
-_il_home_win_cfg_update(void) 
-{
-   _il_home_apps_unpopulate();
-   _il_home_apps_populate();
-}
-
 static void 
 _il_home_desks_populate(void) 
 {
diff --git a/src/modules/illume-home/e_mod_main.h b/src/modules/illume-home/e_mod_main.h
index 857481aee..8a1864b5b 100644
--- a/src/modules/illume-home/e_mod_main.h
+++ b/src/modules/illume-home/e_mod_main.h
@@ -7,6 +7,6 @@ EAPI void *e_modapi_init(E_Module *m);
 EAPI int e_modapi_shutdown(E_Module *m);
 EAPI int e_modapi_save(E_Module *m);
 
-void _il_home_win_cfg_update(void);
+EAPI void il_home_win_cfg_update(void);
 
 #endif
diff --git a/src/modules/illume-keyboard/e_mod_config.c b/src/modules/illume-keyboard/e_mod_config.c
index a248f95b3..ced031393 100644
--- a/src/modules/illume-keyboard/e_mod_config.c
+++ b/src/modules/illume-keyboard/e_mod_config.c
@@ -63,6 +63,8 @@ il_kbd_config_init(E_Module *m)
 EAPI int 
 il_kbd_config_shutdown(void) 
 {
+   il_kbd_cfg->cfd = NULL;
+
    e_configure_registry_item_del("illume/keyboard");
    e_configure_registry_category_del("illume");
 
@@ -117,7 +119,7 @@ _il_kbd_config_create(E_Config_Dialog *cfd)
 static void 
 _il_kbd_config_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
-
+   il_kbd_cfg->cfd = NULL;
 }
 
 static Evas_Object *