diff --git a/workspace.cpp b/workspace.cpp
index 83deeb7389..e76c7d7774 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -391,6 +391,9 @@ void Workspace::init()
                 x_stacking_dirty = true;
                 updateStackingOrder(true);
                 updateClientArea();
+                if (c->wantsInput()) {
+                    activateClient(c);
+                }
             }
         );
         connect(w, &WaylandServer::shellClientRemoved, this,