diff --git a/src/shell-app-system.c b/src/shell-app-system.c
index ad27ade85..f312b80f6 100644
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -618,6 +618,7 @@ _shell_app_system_notify_app_state_changed (ShellAppSystem *self,
   switch (state)
     {
     case SHELL_APP_STATE_RUNNING:
+    case SHELL_APP_STATE_BUSY:
       g_hash_table_insert (self->priv->running_apps, g_object_ref (app), NULL);
       break;
     case SHELL_APP_STATE_STARTING:
diff --git a/src/shell-app.c b/src/shell-app.c
index 9e16f807e..fdc7f3ff1 100644
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -653,6 +653,7 @@ shell_app_activate_full (ShellApp      *app,
       case SHELL_APP_STATE_STARTING:
         break;
       case SHELL_APP_STATE_RUNNING:
+      case SHELL_APP_STATE_BUSY:
         shell_app_activate_window (app, NULL, timestamp);
         break;
     }