diff --git a/src/modules/everything-apps/e_mod_main.c b/src/modules/everything-apps/e_mod_main.c
index c818ada81..49e93414b 100644
--- a/src/modules/everything-apps/e_mod_main.c
+++ b/src/modules/everything-apps/e_mod_main.c
@@ -966,8 +966,6 @@ _plugins_init(const Evry_API *api)
    if (!evry->api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
 
-   evry_module->active = EINA_TRUE;
-
    p = EVRY_PLUGIN_NEW(Plugin, N_("Applications"), NULL, EVRY_TYPE_APP,
 		       _begin, _finish, _fetch, NULL);
    p->complete = &_complete;
@@ -1298,7 +1296,7 @@ e_modapi_init(E_Module *m)
    EVRY_MODULE_REGISTER(evry_module);
 
    if ((evry = e_datastore_get("everything_loaded")))
-     _plugins_init(evry);
+     evry_module->active = _plugins_init(evry);
 
    /* taken from e_exebuf.c */
    exelist_exe_edd = E_CONFIG_DD_NEW("E_Exe", E_Exe);
diff --git a/src/modules/everything-aspell/e_mod_main.c b/src/modules/everything-aspell/e_mod_main.c
index 579c8052f..998c0f544 100644
--- a/src/modules/everything-aspell/e_mod_main.c
+++ b/src/modules/everything-aspell/e_mod_main.c
@@ -422,8 +422,6 @@ _plugins_init(const Evry_API *_api)
 
    _plug = (Plugin *) p;
 
-   evry_module->active = EINA_TRUE;
-
    return EINA_TRUE;
 }
 
@@ -658,7 +656,7 @@ e_modapi_init(E_Module *m)
    EVRY_MODULE_REGISTER(evry_module);
 
    if ((evry = e_datastore_get("everything_loaded")))
-     _plugins_init(evry);
+     evry_module->active = _plugins_init(evry);
 
    e_module_delayed_set(m, 1);
 
diff --git a/src/modules/everything-calc/e_mod_main.c b/src/modules/everything-calc/e_mod_main.c
index c758ca4a6..015a4be9d 100644
--- a/src/modules/everything-calc/e_mod_main.c
+++ b/src/modules/everything-calc/e_mod_main.c
@@ -242,8 +242,6 @@ _plugins_init(const Evry_API *_api)
 	pc->trigger = eina_stringshare_add("=");
      }
 
-   evry_module->active = EINA_TRUE;
-   
    return EINA_TRUE;
 }
 
@@ -275,7 +273,7 @@ e_modapi_init(E_Module *m)
    EVRY_MODULE_REGISTER(evry_module);
 
    if ((evry = e_datastore_get("everything_loaded")))
-     _plugins_init(evry);
+     evry_module->active = _plugins_init(evry);
 
    e_module_delayed_set(m, 1);
    
diff --git a/src/modules/everything-files/e_mod_main.c b/src/modules/everything-files/e_mod_main.c
index 95f59f177..ce094740a 100644
--- a/src/modules/everything-files/e_mod_main.c
+++ b/src/modules/everything-files/e_mod_main.c
@@ -1267,8 +1267,6 @@ _plugins_init(const Evry_API *api)
    _mime_dir = eina_stringshare_add("inode/directory");
    _mime_mount = eina_stringshare_add("inode/mountpoint");
 
-   evry_module->active = EINA_TRUE;
-   
 #define PLUGIN_NEW(_name, _icon, _begin, _finish, _fetch) \
    p = EVRY_PLUGIN_NEW(Evry_Plugin, _name, _icon, EVRY_TYPE_FILE, \
 		       _begin, _finish, _fetch, NULL);	\
@@ -1579,7 +1577,7 @@ e_modapi_init(E_Module *m)
    EVRY_MODULE_REGISTER(evry_module);
 
    if ((evry = e_datastore_get("everything_loaded")))
-     _plugins_init(evry);
+     evry_module->active = _plugins_init(evry);
       
    e_module_delayed_set(m, 1);
    
diff --git a/src/modules/everything-settings/e_mod_main.c b/src/modules/everything-settings/e_mod_main.c
index ebc62fbc2..6221e68fa 100644
--- a/src/modules/everything-settings/e_mod_main.c
+++ b/src/modules/everything-settings/e_mod_main.c
@@ -124,8 +124,6 @@ _plugins_init(const Evry_API *_api)
 
    evry->action_register(act, 0);
 
-   evry_module->active = EINA_TRUE;
-
    return EINA_TRUE;
 }
 
@@ -159,7 +157,7 @@ e_modapi_init(E_Module *m)
    EVRY_MODULE_REGISTER(evry_module);
 
    if ((evry = e_datastore_get("everything_loaded")))
-     _plugins_init(evry);
+     evry_module->active = _plugins_init(evry);
 
    e_module_delayed_set(m, 1);
    
diff --git a/src/modules/everything-wallpaper/e_mod_main.c b/src/modules/everything-wallpaper/e_mod_main.c
index 7b74826a1..083a673dc 100644
--- a/src/modules/everything-wallpaper/e_mod_main.c
+++ b/src/modules/everything-wallpaper/e_mod_main.c
@@ -126,8 +126,6 @@ _plugins_init(const Evry_API *_api)
 
    evry->action_register(_act, 2);
 
-   evry_module->active = EINA_TRUE;
-   
    return EINA_TRUE;
 }
 
@@ -378,7 +376,7 @@ e_modapi_init(E_Module *m)
    EVRY_MODULE_REGISTER(evry_module);
 
    if ((evry = e_datastore_get("everything_loaded")))
-     _plugins_init(evry);
+     evry_module->active = _plugins_init(evry);
 
    e_module_delayed_set(m, 1);
 
diff --git a/src/modules/everything-windows/e_mod_main.c b/src/modules/everything-windows/e_mod_main.c
index 37dcb2f58..4b9b84535 100644
--- a/src/modules/everything-windows/e_mod_main.c
+++ b/src/modules/everything-windows/e_mod_main.c
@@ -402,8 +402,6 @@ _plugins_init(const Evry_API *_api)
    _actions = eina_list_append(_actions, act);
    evry->action_register(act, 3);
 
-   evry_module->active = EINA_TRUE;
-   
    return EINA_TRUE;
 }
 
@@ -440,7 +438,7 @@ e_modapi_init(E_Module *m)
    EVRY_MODULE_REGISTER(evry_module);
 
    if ((evry = e_datastore_get("everything_loaded")))
-     _plugins_init(evry);
+     evry_module->active = _plugins_init(evry);
 
    e_module_delayed_set(m, 1);
 
diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c
index 160debd46..8af516fbb 100644
--- a/src/modules/everything/e_mod_main.c
+++ b/src/modules/everything/e_mod_main.c
@@ -209,7 +209,7 @@ e_modapi_init(E_Module *m)
    e_datastore_set("everything_loaded", _api);
 
    EINA_LIST_FOREACH(e_datastore_get("everything_modules"), l, em)
-     em->init(_api);
+     em->active = em->init(_api);
    
    /* cleanup every hour :) */
    cleanup_timer = ecore_timer_add(3600, _cleanup_history, NULL);