diff --git a/src/game.cpp b/src/game.cpp
index 50d3378..87a4588 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -692,6 +692,15 @@ void Game::handleEvent(const WindowResizedEvent& event)
 	skipSplash();
 }
 
+void Game::handleEvent(const WindowMovedEvent& event)
+{
+	if (!(*fullscreen))
+	{
+		windowPosition = {event.x, event.y};
+		saveSettings();
+	}
+}
+
 void Game::handleEvent(const GamepadConnectedEvent& event)
 {
 	// Unmap all controls
@@ -2989,9 +2998,9 @@ void Game::restringUI()
 	settingsMenuControlsItem->setName(getString("controls"));
 	settingsMenuControlsItem->setValue(getString("ellipsis"));
 	settingsMenuFullscreenItem->setName(getString("fullscreen"));
-	settingsMenuFullscreenItem->setValue((fullscreen) ? onString : offString);
+	settingsMenuFullscreenItem->setValue((*fullscreen) ? onString : offString);
 	settingsMenuVSyncItem->setName(getString("v-sync"));
-	settingsMenuVSyncItem->setValue((vsync) ? onString : offString);
+	settingsMenuVSyncItem->setValue((*vsync) ? onString : offString);
 	settingsMenuLanguageItem->setName(getString("language"));
 	settingsMenuLanguageItem->setValue(getString("language-name"));
 	settingsMenuBackItem->setName(backString);
diff --git a/src/game.hpp b/src/game.hpp
index ce6267f..ba5282a 100644
--- a/src/game.hpp
+++ b/src/game.hpp
@@ -162,6 +162,7 @@ private:
 	virtual void render();
 	virtual void exit();
 	virtual void handleEvent(const WindowResizedEvent& event);
+	virtual void handleEvent(const WindowMovedEvent& event);
 	virtual void handleEvent(const GamepadConnectedEvent& event);
 	virtual void handleEvent(const GamepadDisconnectedEvent& event);
 	virtual void handleEvent(const ScheduledFunctionEvent& event);