diff --git a/src/java/org/lwjgl/input/Mouse.java b/src/java/org/lwjgl/input/Mouse.java
index 3feb6a2a..ee7400cc 100644
--- a/src/java/org/lwjgl/input/Mouse.java
+++ b/src/java/org/lwjgl/input/Mouse.java
@@ -630,7 +630,7 @@ public class Mouse {
 	 */
 	public static void updateCursor() {
 		synchronized (OpenGLPackageAccess.global_lock) {
-			if (emulateCursorAnimation && currentCursor != null && currentCursor.hasTimedOut()) {
+			if (emulateCursorAnimation && currentCursor != null && currentCursor.hasTimedOut() && Mouse.isInsideWindow()) {
 				currentCursor.nextCursor();
 				try {
 					setNativeCursor(currentCursor);
diff --git a/src/java/org/lwjgl/opengl/WindowsDisplay.java b/src/java/org/lwjgl/opengl/WindowsDisplay.java
index c59c49be..7bf6102e 100644
--- a/src/java/org/lwjgl/opengl/WindowsDisplay.java
+++ b/src/java/org/lwjgl/opengl/WindowsDisplay.java
@@ -761,7 +761,6 @@ final class WindowsDisplay implements DisplayImplementation {
 	private static native int defWindowProc(long hwnd, int msg, long wParam, long lParam);
 
 	private void checkCursorState() {
-		updateCursor();
 		updateClipping();
 	}