diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/RenderWindowInputHandler.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/RenderWindowInputHandler.kt
index 384f81616..a9dc8ccbc 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/RenderWindowInputHandler.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/RenderWindowInputHandler.kt
@@ -282,8 +282,10 @@ class RenderWindowInputHandler(
             keysLastDownTime[keyCode] = currentTime
         }
 
-
-        if (inputHandler != this.inputHandler && this.inputHandler != null) {
+        if (this.inputHandler == null) {
+            skipCharPress = false
+            skipMouseMove = false
+        } else if (inputHandler != this.inputHandler) {
             skipCharPress = true
             skipMouseMove = true
         }