diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index b2b9b02..f4f2e93 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -54,7 +54,6 @@ e_modapi_init(E_Module *m)
    mod->edje_file = eina_stringshare_add(buf);
 
    ds_init();
-   e_moveresize_replace(EINA_TRUE);
    mr_init();
    maximize_init();
 
diff --git a/src/moveresize.c b/src/moveresize.c
index f77e1fa..c8a73b1 100644
--- a/src/moveresize.c
+++ b/src/moveresize.c
@@ -387,6 +387,8 @@ mr_init(void)
 {
    unsigned int x = 0;
 
+   e_moveresize_replace(EINA_TRUE);
+
    ec_hooks[x++] = e_client_hook_add(E_CLIENT_HOOK_MOVE_BEGIN, move_begin, NULL);
    ec_hooks[x++] = e_client_hook_add(E_CLIENT_HOOK_MOVE_UPDATE, move_update, NULL);
    ec_hooks[x++] = e_client_hook_add(E_CLIENT_HOOK_MOVE_END, move_end, NULL);
@@ -404,4 +406,5 @@ mr_shutdown(void)
    for (; x < EC_HOOK_COUNT; x++)
      E_FREE_FUNC(ec_hooks[x], e_client_hook_del);
    clear_all();
+   e_moveresize_replace(EINA_FALSE);
 }