diff --git a/source/common/inputstate.cpp b/source/common/inputstate.cpp
index a81ca2083..4036dfc0f 100644
--- a/source/common/inputstate.cpp
+++ b/source/common/inputstate.cpp
@@ -60,7 +60,7 @@ void InputState::AddEvent(const event_t *ev)
 			case KEY_MOUSE5: mouseSetBit(THUMB2_MOUSE, ev->type == EV_KeyDown); break;
 			default: break;
 		}
+		keySetState(ev->data1, ev->type == EV_KeyDown);
+		if (ev->data2) keySetChar(ev->data2);
 	}
-	keySetState(ev->data1, ev->type == EV_KeyDown);
-	if (ev->data2) keySetChar(ev->data2);
 }