diff --git a/ChangeLog b/ChangeLog
index 5cb13b17f..99ba886c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-06  Leena Gunda  <leena.gunda@wipro.com>
+
+	* src/window.c (meta_window_unmaximize): Restore the wireframe
+	rectangle co-ordinates to saved window co-ordinates. Fixes
+	bug #161236.
+
 2005-01-03  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* src/Makefile.am (install-data-local): Install schema data from
diff --git a/src/window.c b/src/window.c
index 3a06eaf5b..aba733f15 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1991,6 +1991,11 @@ meta_window_unmaximize (MetaWindow  *window)
                                window->saved_rect.width,
                                window->saved_rect.height);
 
+      if (window->display->grab_wireframe_active)
+        {
+          window->display->grab_wireframe_rect = window->saved_rect;
+        }
+
       recalc_window_features (window);
       set_net_wm_state (window);
     }