diff --git a/src/modules/illume2/e_mod_kbd.c b/src/modules/illume2/e_mod_kbd.c
index aaefdaa15..bab6dd9c4 100644
--- a/src/modules/illume2/e_mod_kbd.c
+++ b/src/modules/illume2/e_mod_kbd.c
@@ -244,6 +244,11 @@ _e_mod_kbd_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, void *ev
 
    ev = event;
 
+   /* if we removed the focused border, reset some variables */
+   if ((_prev_focused_border) && (_prev_focused_border == ev->border)) 
+     {
+        _prev_focused_border = NULL;
+     }
    /* if we removed the focused border, reset some variables */
    if ((_focused_border) && (_focused_border == ev->border)) 
      {