diff --git a/ChangeLog b/ChangeLog
index b8dab99f6..2b0bf451b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-10  Havoc Pennington  <hp@pobox.com>
+
+	* src/window.c (meta_window_maximize): unshade window if shaded,
+	from JeyaSudha
+	(meta_window_make_fullscreen): ditto
+
 2002-08-10  Havoc Pennington  <hp@pobox.com>
 
 	* src/menu.c: reorder the menu items so that Close is at the
diff --git a/src/window.c b/src/window.c
index 259d8f548..0b3e264fc 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1594,6 +1594,9 @@ meta_window_maximize (MetaWindow  *window)
     {
       meta_topic (META_DEBUG_WINDOW_OPS,
                   "Maximizing %s\n", window->desc);
+
+      if (window->shaded)
+        meta_window_unshade (window);
       
       window->maximized = TRUE;
 
@@ -1645,6 +1648,9 @@ meta_window_make_fullscreen (MetaWindow  *window)
     {
       meta_topic (META_DEBUG_WINDOW_OPS,
                   "Fullscreening %s\n", window->desc);
+
+      if (window->shaded)
+        meta_window_unshade (window);
       
       window->fullscreen = TRUE;