diff --git a/AppKit/NSWindow.m b/AppKit/NSWindow.m
index c818c223..75587a59 100755
--- a/AppKit/NSWindow.m
+++ b/AppKit/NSWindow.m
@@ -2771,7 +2771,12 @@ NSString * const NSWindowDidAnimateNotification=@"NSWindowDidAnimateNotification
      delay=2.;
     [[NSToolTipWindow sharedToolTipWindow] performSelector:@selector(orderFront:) withObject:nil afterDelay:delay];
    }
-
+   
+   if(!cursorIsSet){
+    [[NSCursor currentCursor] set];
+    cursorIsSet=YES;
+   }
+   
    return cursorIsSet;
 }