diff --git a/src/CameraController.hx b/src/CameraController.hx
index 8ecf8cb4..e3e9dfc8 100644
--- a/src/CameraController.hx
+++ b/src/CameraController.hx
@@ -164,11 +164,15 @@ class CameraController extends Object {
 		var cameraPitchDelta = (Key.isDown(Settings.controlsSettings.camBackward) ? 1 : 0)
 			- (Key.isDown(Settings.controlsSettings.camForward) ? 1 : 0)
 			- Gamepad.getAxis(Settings.gamepadSettings.cameraYAxis);
-		nextCameraPitch += 0.75 * 5 * cameraPitchDelta * dt;
+		if (Settings.gamepadSettings.invertYAxis)
+			cameraPitchDelta = -cameraPitchDelta;
+		nextCameraPitch += 0.75 * 5 * cameraPitchDelta * dt * Settings.gamepadSettings.cameraSensitivity;
 		var cameraYawDelta = (Key.isDown(Settings.controlsSettings.camRight) ? 1 : 0)
 			- (Key.isDown(Settings.controlsSettings.camLeft) ? 1 : 0)
 			+ Gamepad.getAxis(Settings.gamepadSettings.cameraXAxis);
-		nextCameraYaw += 0.75 * 5 * cameraYawDelta * dt;
+			if (Settings.gamepadSettings.invertXAxis)
+				cameraYawDelta = -cameraYawDelta;
+		nextCameraYaw += 0.75 * 5 * cameraYawDelta * dt * Settings.gamepadSettings.cameraSensitivity;
 
 		nextCameraPitch = Math.max(-Math.PI / 2 + Math.PI / 4, Math.min(Math.PI / 2 - 0.0001, nextCameraPitch));
 
diff --git a/src/Settings.hx b/src/Settings.hx
index 70022eab..10290143 100644
--- a/src/Settings.hx
+++ b/src/Settings.hx
@@ -162,7 +162,7 @@ class Settings {
 		cameraYAxis: "ranalogY",
 		jump: ["A", "LT"],
 		powerup: ["B", "RT"],
-		cameraSensitivity: 0.6,
+		cameraSensitivity: 1.0,
 		invertXAxis: false,
 		invertYAxis: false,
 		respawn: ["back"],