diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c
index fe903c5d1..053a2b947 100644
--- a/src/modules/tiling/e_mod_tiling.c
+++ b/src/modules/tiling/e_mod_tiling.c
@@ -58,6 +58,7 @@ static struct tiling_mod_main_g
                          *handler_desk_set,
                          *handler_compositor_resize;
     E_Client_Hook        *pre_client_assign_hook;
+    E_Client_Menu_Hook   *client_menu_hook;
 
     Tiling_Info          *tinfo;
     Eina_Hash            *info_hash;
@@ -1079,6 +1080,11 @@ _bd_hook(void *d __UNUSED__, E_Client *ec)
    if (!ec->border_menu) return;
    m = ec->border_menu;
 
+    Client_Extra *extra = eina_hash_find(_G.client_extras, &ec);
+    if (!extra) {
+        return;
+    }
+
    /* position menu item just before the last separator */
    EINA_LIST_REVERSE_FOREACH(m->items, l, mi)
       if (mi->separator) break;
@@ -1087,12 +1093,6 @@ _bd_hook(void *d __UNUSED__, E_Client *ec)
    mi = eina_list_data_get(l);
    if (!mi) return;
 
-    Client_Extra *extra = eina_hash_find(_G.client_extras, &ec);
-    if (!extra) {
-        ERR("No extra for %p", ec);
-        return;
-    }
-
    mi = e_menu_item_new_relative(m, mi);
    e_menu_item_label_set(mi, _("Floating"));
    e_menu_item_check_set(mi, true);
@@ -1247,7 +1247,7 @@ e_modapi_init(E_Module *m)
         E_CONFIG_LIMIT(vd->nb_stacks, 0, TILING_MAX_STACKS);
     }
 
-    e_int_client_menu_hook_add(_bd_hook, NULL);
+    _G.client_menu_hook = e_int_client_menu_hook_add(_bd_hook, NULL);
 
     desk = get_current_desk();
     _G.tinfo = _initialize_tinfo(desk);
@@ -1324,6 +1324,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
 {
     _disable_all_tiling();
 
+    e_int_client_menu_hook_del(_G.client_menu_hook);
+
     if (tiling_g.log_domain >= 0) {
         eina_log_domain_unregister(tiling_g.log_domain);
         tiling_g.log_domain = -1;