diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/Camera.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/Camera.kt
index 0bea1a309..5ef1cf463 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/Camera.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/Camera.kt
@@ -3,9 +3,8 @@ package de.bixilon.minosoft.gui.rendering.camera
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 
 class Camera(
-    private val renderWindow: RenderWindow,
+    renderWindow: RenderWindow,
 ) {
-    private val connection = renderWindow.connection
     val matrixHandler = MatrixHandler(renderWindow)
     val raycastHandler = RaycastHandler(renderWindow, this)
     val fogManager = FogManager(renderWindow)
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 4cf64a7cd..0205b0322 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
@@ -94,6 +94,7 @@ class RenderWindowInputHandler(
                 keyBinding.keyBinding = it.valueAdded
             }
         }
+        cameraInput.init()
     }
 
 
@@ -276,6 +277,7 @@ class RenderWindowInputHandler(
     }
 
     fun draw(delta: Double) {
+        cameraInput.update()
         interactionManager.draw(delta)
     }
 }