diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index bb84cdafc..74dc16571 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -461,6 +461,7 @@ meta_window_apply_session_info (MetaWindow *window,
           MetaWorkspace *workspace = spaces->data;
 
           meta_window_change_workspace (window, workspace);
+          window->initial_workspace_set = TRUE;
 
           meta_topic (META_DEBUG_SM,
                       "Restoring saved window %s to workspace %d\n",