diff --git a/core/src/main/kotlin/com/last/commit/FirstScreen.kt b/core/src/main/kotlin/com/last/commit/FirstScreen.kt
index d96c906..eaae4c7 100644
--- a/core/src/main/kotlin/com/last/commit/FirstScreen.kt
+++ b/core/src/main/kotlin/com/last/commit/FirstScreen.kt
@@ -254,15 +254,17 @@ class FirstScreen(val gameState: GameState) : Screen, InputProcessor {
     override fun keyTyped(character: Char): Boolean {
         val keyCode = character.code
 
-        if (game.settings.isInteractPressed(keyCode)) {
+        if (gameState.settings.isInteractPressed(keyCode)) {
             openDoor()
-        } else if (game.settings.isTimeTravelPressed(keyCode)) {
+        } else if (gameState.settings.isTimeTravelPressed(keyCode)) {
             map.teleport(player)
-        } else if (game.settings.isOpenInventoryPressed(keyCode)) {
+        } else if (gameState.settings.isOpenInventoryPressed(keyCode)) {
             inventoryStage.visible = !inventoryStage.visible
         } else if (character == 'p') {
-            player.inventory.add("compass")
+            gameState.inventory.add("compass")
             inventoryStage.refresh()
+        } else if (gameState.settings.isInteractPressed(keyCode)) {
+            this.openDoor()
         }
         return false
     }
diff --git a/core/src/main/kotlin/com/last/commit/Game.kt b/core/src/main/kotlin/com/last/commit/Game.kt
index e9b97c6..1c5501f 100644
--- a/core/src/main/kotlin/com/last/commit/Game.kt
+++ b/core/src/main/kotlin/com/last/commit/Game.kt
@@ -2,6 +2,7 @@ package com.last.commit
 
 import com.badlogic.gdx.Game
 import com.last.commit.inventory.Inventory
+import com.last.commit.config.PlayerSettings
 import GameState
 
 /** [com.badlogic.gdx.ApplicationListener] implementation shared by all platforms.  */
@@ -9,17 +10,15 @@ class Game : Game() {
 
     private lateinit var state: GameState
 
-    var settings = PlayerSettings()
-
     override fun create() {
-        setScreen(FirstScreen(this))
         createState()
         setScreen(FirstScreen(state))
     }
 
     fun createState() {
         state = GameState(
-            Inventory()
+            Inventory(),
+            PlayerSettings()
         )
     }
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/last/commit/GameState.kt b/core/src/main/kotlin/com/last/commit/GameState.kt
index 0ea8cfe..e276981 100644
--- a/core/src/main/kotlin/com/last/commit/GameState.kt
+++ b/core/src/main/kotlin/com/last/commit/GameState.kt
@@ -1,5 +1,7 @@
 import com.last.commit.inventory.Inventory
+import com.last.commit.config.PlayerSettings
 
 public data class GameState(
     public val inventory: Inventory,
+    public val settings: PlayerSettings,
 )
\ No newline at end of file