diff --git a/wibox.c b/wibox.c
index 9c0f8b572..87e243339 100644
--- a/wibox.c
+++ b/wibox.c
@@ -545,6 +545,7 @@ wibox_setvisible(wibox_t *wibox, bool v)
     if(v != wibox->isvisible)
     {
         wibox->isvisible = v;
+        wibox->mouse_over = NULL;
 
         if(wibox->screen != SCREEN_UNDEF)
         {
@@ -587,6 +588,8 @@ wibox_detach(wibox_t *wibox)
         /* restore position */
         wibox->isvisible = v;
 
+        wibox->mouse_over = NULL;
+
         simplewindow_wipe(&wibox->sw);
 
         for(int i = 0; i < globalconf.screens[wibox->screen].wiboxes.len; i++)