diff --git a/src/UI/Canvas/Selection.gd b/src/UI/Canvas/Selection.gd
index db6b58a06..1fdf92a15 100644
--- a/src/UI/Canvas/Selection.gd
+++ b/src/UI/Canvas/Selection.gd
@@ -58,24 +58,24 @@ class Gizmo:
 		type = _type
 		direction = _direction
 
-	func get_cursor() -> DisplayServer.CursorShape:
-		var cursor := DisplayServer.CURSOR_MOVE
+	func get_cursor() -> Input.CursorShape:
+		var cursor := Input.CURSOR_MOVE
 		if direction == Vector2i.ZERO:
-			return DisplayServer.CURSOR_POINTING_HAND
+			return Input.CURSOR_POINTING_HAND
 		elif direction == Vector2i(-1, -1) or direction == Vector2i(1, 1):  # Top left or bottom right
 			if Global.mirror_view:
-				cursor = DisplayServer.CURSOR_BDIAGSIZE
+				cursor = Input.CURSOR_BDIAGSIZE
 			else:
-				cursor = DisplayServer.CURSOR_FDIAGSIZE
+				cursor = Input.CURSOR_FDIAGSIZE
 		elif direction == Vector2i(1, -1) or direction == Vector2i(-1, 1):  # Top right or bottom left
 			if Global.mirror_view:
-				cursor = DisplayServer.CURSOR_FDIAGSIZE
+				cursor = Input.CURSOR_FDIAGSIZE
 			else:
-				cursor = DisplayServer.CURSOR_BDIAGSIZE
+				cursor = Input.CURSOR_BDIAGSIZE
 		elif direction == Vector2i(0, -1) or direction == Vector2i(0, 1):  # Center top or center bottom
-			cursor = DisplayServer.CURSOR_VSIZE
+			cursor = Input.CURSOR_VSIZE
 		elif direction == Vector2i(-1, 0) or direction == Vector2i(1, 0):  # Center left or center right
-			cursor = DisplayServer.CURSOR_HSIZE
+			cursor = Input.CURSOR_HSIZE
 		return cursor
 
 
@@ -167,17 +167,17 @@ func _input(event: InputEvent) -> void:
 			_gizmo_rotate()
 	else:  # Set the appropriate cursor
 		if gizmo_hover:
-			DisplayServer.cursor_set_shape(gizmo_hover.get_cursor())
+			Input.set_default_cursor_shape(gizmo_hover.get_cursor())
 		else:
-			var cursor := DisplayServer.CURSOR_ARROW
+			var cursor := Input.CURSOR_ARROW
 			if Global.cross_cursor:
-				cursor = DisplayServer.CURSOR_CROSS
+				cursor = Input.CURSOR_CROSS
 			var layer: BaseLayer = project.layers[project.current_layer]
 			if not layer.can_layer_get_drawn():
-				cursor = DisplayServer.CURSOR_FORBIDDEN
+				cursor = Input.CURSOR_FORBIDDEN
 
 			if DisplayServer.cursor_get_shape() != cursor:
-				DisplayServer.cursor_set_shape(cursor)
+				Input.set_default_cursor_shape(cursor)
 
 
 func _move_with_arrow_keys(event: InputEvent) -> void:
diff --git a/src/UI/UI.tscn b/src/UI/UI.tscn
index 82a40ff06..11cdd6789 100644
--- a/src/UI/UI.tscn
+++ b/src/UI/UI.tscn
@@ -305,7 +305,6 @@ layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 focus_mode = 2
-mouse_default_cursor_shape = 3
 stretch = true
 script = ExtResource("23")
 camera_path = NodePath("SubViewport/Camera2D")
diff --git a/src/UI/ViewportContainer.gd b/src/UI/ViewportContainer.gd
index 1110ef470..99cee0831 100644
--- a/src/UI/ViewportContainer.gd
+++ b/src/UI/ViewportContainer.gd
@@ -14,9 +14,11 @@ func _on_ViewportContainer_mouse_entered() -> void:
 	camera.set_process_input(true)
 	Global.control.left_cursor.visible = Global.show_left_tool_icon
 	Global.control.right_cursor.visible = Global.show_right_tool_icon
+	Input.set_default_cursor_shape(Input.CURSOR_CROSS)
 
 
 func _on_ViewportContainer_mouse_exited() -> void:
 	camera.set_process_input(false)
 	Global.control.left_cursor.visible = false
 	Global.control.right_cursor.visible = false
+	Input.set_default_cursor_shape(Input.CURSOR_ARROW)