diff --git a/ChangeLog b/ChangeLog
index 268f97cee..58dd30b1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-31  Elijah Newren  <newren@gmail.com>
+
+	Correct the stacking when return from fullscreen mode.  Fixes
+	#165718.
+	
+	* src/window.c: (meta_window_unmake_fullscreen): Update the layer
+	after resizing the window
+
 2005-01-31  Muktha  <muktha.narayan@wipro.com>
 
 	src/themes/Atlanta/metacity-theme-1.xml:
diff --git a/src/window.c b/src/window.c
index dd8922b4a..8416444d4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2052,8 +2052,6 @@ meta_window_unmake_fullscreen (MetaWindow  *window)
       
       window->fullscreen = FALSE;
 
-      meta_window_update_layer (window);
-      
       meta_window_move_resize (window,
                                TRUE,
                                window->saved_rect.x,
@@ -2061,6 +2059,8 @@ meta_window_unmake_fullscreen (MetaWindow  *window)
                                window->saved_rect.width,
                                window->saved_rect.height);
 
+      meta_window_update_layer (window);
+      
       recalc_window_features (window);
       set_net_wm_state (window);
     }