diff --git a/ChangeLog b/ChangeLog
index dad9887c7..96e12fbd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-06-08  Havoc Pennington  <hp@pobox.com>
+
+	* src/display.c (meta_display_open): set net_supporting_wm_check 
+	in addition to win_supporting_wm_check, patch from 
+	JeyaSudha for #83365
+
+	* src/screen.c (set_wm_check_hint): remove setting
+	win_supporting_wm_check on leader window here, done already in
+	display.c
+
 2002-06-08  Havoc Pennington  <hp@pobox.com>
 
 	* src/keybindings.c (meta_window_ungrab_keys): set keys_grabbed to
diff --git a/src/display.c b/src/display.c
index 1dcdb948a..f7144e8af 100644
--- a/src/display.c
+++ b/src/display.c
@@ -457,6 +457,12 @@ meta_display_open (const char *name)
                      display->atom_win_supporting_wm_check,
                      XA_CARDINAL,
                      32, PropModeReplace, (guchar*) data, 1);
+
+    XChangeProperty (display->xdisplay,
+                     display->leader_window,
+                     display->atom_net_supporting_wm_check,
+                     XA_CARDINAL,
+                     32, PropModeReplace, (guchar*) data, 1);
   }
   
   /* Now manage all existing windows */
diff --git a/src/keybindings.c b/src/keybindings.c
index 482ad8830..79ddafe58 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -748,6 +748,8 @@ meta_window_ungrab_keys (MetaWindow  *window)
       else if (!window->grab_on_frame)
         ungrab_all_keys (window->display,
                          window->xwindow);
+
+      window->keys_grabbed = FALSE;
     }
 }
 
diff --git a/src/screen.c b/src/screen.c
index e5b68ca11..20aa302e8 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -67,12 +67,6 @@ set_wm_check_hint (MetaScreen *screen)
 
   /* Legacy GNOME hint (uses cardinal, dunno why) */
 
-  /* legacy hint window should have property containing self */
-  XChangeProperty (screen->display->xdisplay, screen->display->leader_window,
-                   screen->display->atom_win_supporting_wm_check,
-                   XA_CARDINAL,
-                   32, PropModeReplace, (guchar*) data, 1);
-
   /* do this after setting up window fully, to avoid races
    * with clients listening to property notify on root.
    */