diff --git a/ewmh.c b/ewmh.c
index 13f142e1f..5402cd984 100644
--- a/ewmh.c
+++ b/ewmh.c
@@ -240,11 +240,13 @@ ewmh_process_state_atom(Client *c, Atom state, int set)
         if(set == _NET_WM_STATE_REMOVE)
         {
             c->skiptb = False;
+            c->skip = False;
             c->border = c->oldborder;
         }
         else if(set == _NET_WM_STATE_ADD)
         {
             c->skiptb = True;
+            c->skip = True;
             c->oldborder = c->border;
             c->border = 0;
         }