Index: dlls/x11drv/window.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/window.c,v
retrieving revision 1.116
diff -u -p -r1.116 window.c
--- dlls/x11drv/window.c	22 Aug 2005 09:14:21 -0000	1.116
+++ dlls/x11drv/window.c	19 Oct 2005 00:12:41 -0000
@@ -121,10 +121,18 @@ BOOL X11DRV_is_window_rect_mapped( const
  */
 static int get_window_attributes( struct x11drv_win_data *data, XSetWindowAttributes *attr )
 {
-    if (!data->managed && !using_wine_desktop && is_window_managed( data->hwnd ))
+    if (!using_wine_desktop)
     {
-        data->managed = TRUE;
-        SetPropA( data->hwnd, managed_prop, (HANDLE)1 );
+        if (!data->managed && is_window_managed( data->hwnd ))
+        {
+            data->managed = TRUE;
+            SetPropA( data->hwnd, managed_prop, (HANDLE)1 );
+        }
+        else if (data->managed && !is_window_managed( data->hwnd ))
+        {
+            data->managed = FALSE;
+            RemovePropA( data->hwnd, managed_prop);
+        }
     }
     attr->override_redirect = !data->managed;
     attr->colormap          = X11DRV_PALETTE_PaletteXColormap;