diff --git a/ChangeLog b/ChangeLog
index 31ac850db..695d425c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-13  Anders Carlsson  <andersca@gnu.org>
+
+	* src/theme.c (meta_frame_layout_calc_geometry): Set client height
+	as 0 when the window actually is shaded, not the other way around.
+
 2002-06-12  Havoc Pennington  <hp@redhat.com>
 
 	* src/theme.c (meta_frame_layout_calc_geometry): when a window is
diff --git a/src/theme.c b/src/theme.c
index fe4b5512f..1ca8a5727 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -412,7 +412,8 @@ meta_frame_layout_calc_geometry (const MetaFrameLayout *layout,
                                  &fgeom->right_width);
 
   width = client_width + fgeom->left_width + fgeom->right_width;
-  height = ((flags & META_FRAME_SHADED) ? client_height : 0) +
+
+  height = ((flags & META_FRAME_SHADED) ? 0: client_height) +
     fgeom->top_height + fgeom->bottom_height;
 
   fgeom->width = width;