diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index a90594a5e..d5896adca 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1529,8 +1529,10 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
 
         if ((!ec->comp_data->sub.data) && (!ec->comp_data->buffer_commit))
           {
-             if ((!ec->internal_elm_win) && (!ec->maximized) && (!ec->fullscreen))
-               ec->placed = (!e_client_has_xwindow(ec)) && (ec->netwm.type != E_WINDOW_TYPE_NORMAL);
+             if (e_client_has_xwindow(ec))
+               ec->placed = 0;
+             else if (!ec->placed)
+               ec->placed = ec->netwm.type != E_WINDOW_TYPE_NORMAL;
              ec->want_focus |= ec->icccm.accepts_focus && (!ec->override);
           }
      }