diff --git a/event.c b/event.c
index e5ebb68bb..f58b82a8c 100644
--- a/event.c
+++ b/event.c
@@ -513,7 +513,8 @@ event_handle_enternotify(void *data __attribute__ ((unused)),
         if(wibox->mouse_enter != LUA_REFNIL)
             luaA_dofunction(globalconf.L, wibox->mouse_enter, 0, 0);
     }
-    else if((c = client_getbytitlebarwin(ev->event))
+
+    if((c = client_getbytitlebarwin(ev->event))
        || (c = client_getbywin(ev->event)))
     {
         if(globalconf.hooks.mouse_enter != LUA_REFNIL)
diff --git a/lib/awful/titlebar.lua.in b/lib/awful/titlebar.lua.in
index 4296cf766..57855b1d7 100644
--- a/lib/awful/titlebar.lua.in
+++ b/lib/awful/titlebar.lua.in
@@ -69,7 +69,6 @@ function add(c, args)
         capi.button({ args.modkey }, 3, function (t) mouse.client.resize(t.client) end)
     }
     title:buttons(bts)
-    function title.mouse_enter(s) hooks.user.call('mouse_enter', c) end
 
     local appicon = capi.widget({ type = "imagebox", align = "left" })
     appicon.image = c.icon
@@ -172,7 +171,6 @@ local function button_new(c, name, modkey, theme, state)
     end
 
     button:buttons(bts)
-    function button.mouse_enter(s) hooks.user.call('mouse_enter', c) end
     button.visible = false
     return button
 end