diff --git a/src/java/org/lwjgl/opengl/WindowsKeyboard.java b/src/java/org/lwjgl/opengl/WindowsKeyboard.java
index 1effdb6f..fecfb2cb 100644
--- a/src/java/org/lwjgl/opengl/WindowsKeyboard.java
+++ b/src/java/org/lwjgl/opengl/WindowsKeyboard.java
@@ -155,7 +155,7 @@ final class WindowsKeyboard {
 	}
 
 	public void handleKey(int virt_key, int scan_code, boolean extended, byte event_state, long millis, boolean repeat) {
-		if ( isKeyPressed(event_state) == isKeyPressed(virt_key_down_buffer[virt_key]) )
+		if ( !repeat && isKeyPressed(event_state) == isKeyPressed(virt_key_down_buffer[virt_key]) )
 			return;
 
 		virt_key = translateExtended(virt_key, scan_code, event_state, extended);
diff --git a/src/java/org/lwjgl/test/input/KeyboardTest.java b/src/java/org/lwjgl/test/input/KeyboardTest.java
index 7e368573..2fb9facb 100644
--- a/src/java/org/lwjgl/test/input/KeyboardTest.java
+++ b/src/java/org/lwjgl/test/input/KeyboardTest.java
@@ -202,10 +202,7 @@ public class KeyboardTest {
 
       render();
 
-      try {
-        Thread.sleep(0);
-      } catch (Exception e) {
-      }
+      Display.sync(60);
     }
   }