diff --git a/core/scripts/player.gd b/core/scripts/player.gd
index b9185ad..661dbed 100644
--- a/core/scripts/player.gd
+++ b/core/scripts/player.gd
@@ -22,7 +22,7 @@ var zoom_disabled:bool = false
 var edge_scroll_disabled:bool = ProjectSettings.get_setting("game/controls/edge_scrolling_disabled",false)
 var invert_rotation_x:bool = ProjectSettings.get_setting("game/controls/invert_cam_rotation_x",false)
 var invert_rotation_y:bool = ProjectSettings.get_setting("game/controls/invert_cam_rotation_y",false)
-var default_mouse_mode:= Input.MOUSE_MODE_VISIBLE
+var default_mouse_mode:= Input.MOUSE_MODE_VISIBLE if ProjectSettings.get_setting("game/controls/edge_scrolling_disabled",false) else Input.MOUSE_MODE_CONFINED
 
 var rotation_mode:bool = false
 
diff --git a/project.godot b/project.godot
index a7c9135..5130c9d 100644
--- a/project.godot
+++ b/project.godot
@@ -50,7 +50,7 @@ controls/cam_rotation_speed_x=0.2
 controls/cam_rotation_speed_y=0.2
 controls/invert_cam_rotation_x=false
 controls/invert_cam_rotation_y=true
-controls/edge_scrolling_disabled=true
+controls/edge_scrolling_disabled=false
 
 [input]