diff --git a/ChangeLog b/ChangeLog
index b36bb7c22..31a86dfe7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
+2002-08-07  Havoc Pennington  <hp@redhat.com>
+
+	* src/window.c (meta_window_unmake_fullscreen): update layer
+	(meta_window_make_fullscreen): update layer
+
+	* src/stack.c (compute_layer): put window on fullscreen layer if
+	fullscreen
+
 2002-08-06  Craig Black  <blackc@speakeasy.net>
 
 	* src/window.c: (meta_window_client_message): implement
-  _NET_WM_MOVERESIZE enhancements, see #90077.
+	_NET_WM_MOVERESIZE enhancements, see #90077.
 
 2002-08-06  Havoc Pennington  <hp@redhat.com>
 
diff --git a/src/stack.c b/src/stack.c
index c55ef4572..4b8c00ad1 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -275,10 +275,13 @@ compute_layer (MetaWindow *window)
       break;
       
     default:
-      window->layer = META_LAYER_NORMAL;
+      if (window->fullscreen)
+        window->layer = META_LAYER_FULLSCREEN;
+      else
+        window->layer = META_LAYER_NORMAL;
       break;
-    }
-
+    }  
+  
   meta_topic (META_DEBUG_STACK, "Window %s on layer %d\n",
               window->desc, window->layer);
 }
diff --git a/src/window.c b/src/window.c
index 5bd652273..cc5123405 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1632,7 +1632,7 @@ meta_window_make_fullscreen (MetaWindow  *window)
       
       window->fullscreen = TRUE;
 
-      /* FIXME why did I put this here? */
+      meta_window_update_layer (window);
       meta_window_raise (window);
       
       /* save size/pos as appropriate args for move_resize */
@@ -1661,6 +1661,8 @@ meta_window_unmake_fullscreen (MetaWindow  *window)
       
       window->fullscreen = FALSE;
 
+      meta_window_update_layer (window);
+      
       meta_window_move_resize (window,
                                TRUE,
                                window->saved_rect.x,