diff --git a/src/shell-app.c b/src/shell-app.c
index 99f51ede8..f5b647ced 100644
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -1590,11 +1590,9 @@ shell_app_dispose (GObject *object)
       app->entry = NULL;
     }
 
-  if (app->running_state)
-    {
-      while (app->running_state->windows)
-        _shell_app_remove_window (app, app->running_state->windows->data);
-    }
+  while (app->running_state)
+    _shell_app_remove_window (app, app->running_state->windows->data);
+
   /* We should have been transitioned when we removed all of our windows */
   g_assert (app->state == SHELL_APP_STATE_STOPPED);
   g_assert (app->running_state == NULL);