diff --git a/src/Keypad.cpp b/src/Keypad.cpp
index f146a6d..1ae8b56 100644
--- a/src/Keypad.cpp
+++ b/src/Keypad.cpp
@@ -210,8 +210,10 @@ int Keypad::findInList (int keyCode) {
 // New in 2.0
 char Keypad::waitForKey() {
 	char waitKey = NO_KEY;
-	while( (waitKey = getKey()) == NO_KEY );	// Block everything while waiting for a keypress.
-	return waitKey;
+	while( (waitKey = getKey()) == NO_KEY ){	// Block everything while waiting for a keypress.
+		delay(0);
+		return waitKey;
+	}
 }
 
 // Backwards compatibility function.