diff --git a/src/shell-app.c b/src/shell-app.c
index 63dbc1401..566b1e723 100644
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -757,12 +757,11 @@ void
 _shell_app_remove_window (ShellApp   *app,
                           MetaWindow *window)
 {
+  g_assert (app->running_state != NULL);
 
   if (!g_slist_find (app->running_state->windows, window))
     return;
 
-  g_assert (app->running_state != NULL);
-
   g_signal_handlers_disconnect_by_func (window, G_CALLBACK(shell_app_on_unmanaged), app);
   g_signal_handlers_disconnect_by_func (window, G_CALLBACK(shell_app_on_user_time_changed), app);
   g_object_unref (window);
diff --git a/src/shell-window-tracker.c b/src/shell-window-tracker.c
index e9eda245d..803d60791 100644
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@@ -542,7 +542,8 @@ disassociate_window (ShellWindowTracker   *self,
 
   g_hash_table_remove (self->window_to_app, window);
 
-  _shell_app_remove_window (app, window);
+  if (shell_window_tracker_is_window_interesting (window))
+      _shell_app_remove_window (app, window);
 
   g_signal_emit (self, signals[TRACKED_WINDOWS_CHANGED], 0);