diff --git a/ChangeLog b/ChangeLog
index 7af54c09c..bf4700faa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-08  Elijah Newren  <newren@gmail.com>
+
+	Fix a crash that occurs when removing some virtual desktops and
+	windows happen to be on those desktops.  #318306.
+
+	* src/workspace.c (meta_workspace_relocate_windows): Since windows
+	cannot be on more than one workspace at a time, remove the window
+	from the old workspace before adding it to the new one.
+
 2005-10-08  Elijah Newren  <newren@gmail.com>
 
 	Add my copyright notice to a number of files on which it should
diff --git a/src/workspace.c b/src/workspace.c
index 0ed5d2fe0..70f6ebdf2 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -237,8 +237,8 @@ meta_workspace_relocate_windows (MetaWorkspace *workspace,
     {
       MetaWindow *window = tmp->data;
 
-      meta_workspace_add_window (new_home, window);
       meta_workspace_remove_window (workspace, window);
+      meta_workspace_add_window (new_home, window);
       
       tmp = tmp->next;
     }