diff --git a/wayvr/src/backend/wayvr/comp.rs b/wayvr/src/backend/wayvr/comp.rs
index 924b2ec1..1104e240 100644
--- a/wayvr/src/backend/wayvr/comp.rs
+++ b/wayvr/src/backend/wayvr/comp.rs
@@ -386,10 +386,6 @@ impl XdgShellHandler for Application {
             self.wayvr_tasks
                 .send(WayVRTask::NewToplevel(client.id(), surface.clone()));
         }
-        surface.with_pending_state(|state| {
-            state.states.set(xdg_toplevel::State::Activated);
-        });
-        surface.send_configure();
     }
 
     fn toplevel_destroyed(&mut self, surface: ToplevelSurface) {
diff --git a/wayvr/src/backend/wayvr/mod.rs b/wayvr/src/backend/wayvr/mod.rs
index 97747e42..ae63bfcc 100644
--- a/wayvr/src/backend/wayvr/mod.rs
+++ b/wayvr/src/backend/wayvr/mod.rs
@@ -383,6 +383,7 @@ impl WvrServerState {
                         toplevel.with_pending_state(|state| {
                             state.size = Some(size);
                             state.states.set(xdg_toplevel::State::Activated);
+                            state.states.set(xdg_toplevel::State::Maximized);
                         });
                         toplevel.send_configure();