diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index cf5f53e72..22b260d3a 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -2205,11 +2205,6 @@ e_border_focus_set(E_Border *bd,
                   e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
                   /* e_border_focus_set(bd, 1, 0); */
                }
-             if (bd->was_fullscreen)
-               {
-                  bd->need_fullscreen = 1;
-                  bd->was_fullscreen = 0;
-               }
             return;
           }
 
@@ -2246,10 +2241,7 @@ e_border_focus_set(E_Border *bd,
                                  bd_parent = bd->parent;
                               }
                             if (!unfocus_is_parent)
-                              {
-                                 e_border_unfullscreen(bd2);
-                                 bd2->was_fullscreen = 1;
-                              }
+                              e_border_unfullscreen(bd2);
                          }
                     }
                }
@@ -2302,10 +2294,7 @@ e_border_focus_set(E_Border *bd,
                          }
                     }
                   if (!have_vis_child)
-                    {
-                       e_border_unfullscreen(bd);
-                       bd->was_fullscreen = 1;
-                    }
+                    e_border_unfullscreen(bd);
                }
           }
      }
@@ -2354,10 +2343,7 @@ e_border_focus_set(E_Border *bd,
                   bd_parent = bd->parent;
                }
              if (!unfocus_is_parent)
-               {
-                  e_border_unfullscreen(bd_unfocus);
-                  bd_unfocus->was_fullscreen = 1;
-               }
+               e_border_unfullscreen(bd_unfocus);
           }
      }
 
diff --git a/src/bin/e_border.h b/src/bin/e_border.h
index 4adde0e79..a2c6cf8e4 100644
--- a/src/bin/e_border.h
+++ b/src/bin/e_border.h
@@ -490,7 +490,6 @@ struct _E_Border
    unsigned int       need_shape_merge : 1;
    unsigned int       need_shape_export : 1;
    unsigned int       fullscreen : 1;
-   unsigned int       was_fullscreen : 1;
    unsigned int       need_fullscreen : 1;
    unsigned int       already_unparented : 1;
    unsigned int       need_reparent : 1;