diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h
index 02fe426a4..52e656bff 100644
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -36,7 +36,6 @@ struct _MetaCompScreen
   ClutterActor		*hidden_group;
   GList                 *windows;
   GHashTable            *windows_by_xid;
-  MetaWindow            *focus_window;
   Window                 output;
 
   /* Before we create the output window */
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index 46b097aee..833782b4b 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -412,8 +412,6 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
   info->windows = NULL;
   info->windows_by_xid = g_hash_table_new (g_direct_hash, g_direct_equal);
 
-  info->focus_window = meta_display_get_focus_window (display);
-
   meta_screen_set_cm_selection (screen);
 
   info->stage = clutter_stage_get_default ();
diff --git a/src/compositor/mutter-window.c b/src/compositor/mutter-window.c
index 0333303c2..69605f609 100644
--- a/src/compositor/mutter-window.c
+++ b/src/compositor/mutter-window.c
@@ -1111,9 +1111,6 @@ mutter_window_unmap (MutterWindow *self)
   if (priv->attrs.map_state == IsUnmapped && !priv->needs_unmap)
     return;
 
-  if (priv->window && priv->window == info->focus_window)
-    info->focus_window = NULL;
-
   if (info->switch_workspace_in_progress)
     {
       /*