diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 122343786..69ee96cad 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1155,7 +1155,10 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
           }
 
         if (ec->new_client)
-          ec->placed = placed;
+          {
+             ec->placed = placed;
+             ec->want_focus = ec->icccm.accepts_focus && (!ec->override);
+          }
         else if ((first) && (ec->placed) && (!ec->internal) && (!ec->override))
           {
              ec->x = ec->y = 0;