diff --git a/src/modules/illume-indicator/e_mod_main.c b/src/modules/illume-indicator/e_mod_main.c
index 5360831aa..9dcf16031 100644
--- a/src/modules/illume-indicator/e_mod_main.c
+++ b/src/modules/illume-indicator/e_mod_main.c
@@ -12,8 +12,11 @@ EAPI void *
 e_modapi_init(E_Module *m) 
 {
    if (!il_ind_config_init(m)) return NULL;
+
    e_mod_win_init();
+
    iwin = e_mod_win_new();
+
    return m;
 }
 
diff --git a/src/modules/illume-indicator/e_mod_main.h b/src/modules/illume-indicator/e_mod_main.h
index 439fcdddd..a0405fd9f 100644
--- a/src/modules/illume-indicator/e_mod_main.h
+++ b/src/modules/illume-indicator/e_mod_main.h
@@ -1,7 +1,7 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define IL_IND_WIN_TYPE 0xE1b0786
+#define IL_IND_WIN_TYPE 0xE1b0886
 
 typedef struct _Il_Ind_Win Il_Ind_Win;
 
diff --git a/src/modules/illume-indicator/e_mod_win.c b/src/modules/illume-indicator/e_mod_win.c
index a1683307d..058ecde32 100644
--- a/src/modules/illume-indicator/e_mod_win.c
+++ b/src/modules/illume-indicator/e_mod_win.c
@@ -60,7 +60,7 @@ e_mod_win_new(void)
    e_win_borderless_set(iwin->win, 1);
    iwin->win->data = iwin;
    e_win_title_set(iwin->win, _("Illume Indicator"));
-   e_win_name_class_set(iwin->win, "E", "Illume-Indicator");
+   e_win_name_class_set(iwin->win, "Illume-Indicator", "Illume-Indicator");
 
    evas = e_win_evas_get(iwin->win);
 
@@ -118,9 +118,6 @@ e_mod_win_new(void)
 static void 
 _il_ind_win_cb_free(Il_Ind_Win *iwin) 
 {
-   e_object_del(E_OBJECT(iwin->gadcon));
-   iwin->gadcon = NULL;
-
    if (iwin->menu) 
      {
         e_menu_post_deactivate_callback_set(iwin->menu, NULL, NULL);
@@ -128,6 +125,12 @@ _il_ind_win_cb_free(Il_Ind_Win *iwin)
         iwin->menu = NULL;
      }
 
+   if (iwin->o_event) evas_object_del(iwin->o_event);
+   if (iwin->o_base) evas_object_del(iwin->o_base);
+
+   e_object_del(E_OBJECT(iwin->gadcon));
+   iwin->gadcon = NULL;
+
    e_object_del(E_OBJECT(iwin->win));
    E_FREE(iwin);
 }