diff --git a/src/imput.c b/src/imput.c
index 973823d..d9e41a6 100644
--- a/src/imput.c
+++ b/src/imput.c
@@ -111,14 +111,16 @@ void sys_hit_any_key() {
 	
 	/* message wait flag restore */
 	if (nact->messagewait_enable_save) {
+		/* if message wait was cancelled, consume that input */
+		if (!nact->messagewait_enable) {
+			while(0 == (key & hak_ignore_mask)) {
+				key = sys_keywait(INT_MAX, TRUE);
+			}
+			while(key & hak_releasewait_mask) {
+				key = sys_keywait(100, TRUE);
+			}
+		}
 		nact->messagewait_enable = nact->messagewait_enable_save ;
-		
-		while(0 == (key & hak_ignore_mask)) {
-			key = sys_keywait(INT_MAX, TRUE);
-		}
-		while(key & hak_releasewait_mask) {
-			key = sys_keywait(100, TRUE);
-		}
 	}
 
 	while(0 == (key & hak_ignore_mask)) {