diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 5405435..2ef9a03 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -5181,7 +5181,7 @@ properties_window_finish (StartupData *data)
                                               data);
     }
 
-    remove_pending (data, TRUE, TRUE, FALSE);
+    remove_pending (data, TRUE, (data->window == NULL), FALSE);
     startup_data_free (data);
 }