diff --git a/src/shell-app.c b/src/shell-app.c
index fae61c4d4..d685be225 100644
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -739,9 +739,6 @@ _shell_app_add_window (ShellApp        *app,
 
   g_object_freeze_notify (G_OBJECT (app));
 
-  if (app->state != SHELL_APP_STATE_STARTING)
-    shell_app_state_transition (app, SHELL_APP_STATE_RUNNING);
-
   if (!app->running_state)
       create_running_state (app);
 
@@ -754,6 +751,9 @@ _shell_app_add_window (ShellApp        *app,
   if (user_time > app->running_state->last_user_time)
     app->running_state->last_user_time = user_time;
 
+  if (app->state != SHELL_APP_STATE_STARTING && app->state != SHELL_APP_STATE_RUNNING)
+    shell_app_state_transition (app, SHELL_APP_STATE_RUNNING);
+
   g_object_thaw_notify (G_OBJECT (app));
 
   g_signal_emit (app, shell_app_signals[WINDOWS_CHANGED], 0);