diff --git a/scene/main/world.cpp b/scene/main/world.cpp
index 200c2e243..54677d970 100644
--- a/scene/main/world.cpp
+++ b/scene/main/world.cpp
@@ -36,16 +36,6 @@ void World::set_world_2d(const Ref<World2D> &p_world_2d) {
 	_on_set_world_2d(old_world);
 }
 
-Ref<World2D> World::find_world_2d() const {
-	if (world_2d.is_valid()) {
-		return world_2d;
-	} else if (_parent_world) {
-		return _parent_world->find_world_2d();
-	} else {
-		return Ref<World2D>();
-	}
-}
-
 Ref<World3D> World::get_world_3d() const {
 	return world_3d;
 }
@@ -83,18 +73,6 @@ void World::set_world_3d(const Ref<World3D> &p_world_3d) {
 	_on_set_world_3d(old_world);
 }
 
-Ref<World3D> World::find_world_3d() const {
-	if (own_world_3d.is_valid()) {
-		return own_world_3d;
-	} else if (world_3d.is_valid()) {
-		return world_3d;
-	} else if (_parent_world) {
-		return _parent_world->find_world_3d();
-	} else {
-		return Ref<World3D>();
-	}
-}
-
 bool World::is_using_own_world_3d() const {
 	return own_world_3d.is_valid();
 }
@@ -129,6 +107,28 @@ void World::set_use_own_world_3d(bool p_use_own_world_3d) {
 	_on_set_use_own_world_3d(p_use_own_world_3d);
 }
 
+Ref<World2D> World::find_world_2d() const {
+	if (world_2d.is_valid()) {
+		return world_2d;
+	} else if (_parent_world) {
+		return _parent_world->find_world_2d();
+	} else {
+		return Ref<World2D>();
+	}
+}
+
+Ref<World3D> World::find_world_3d() const {
+	if (own_world_3d.is_valid()) {
+		return own_world_3d;
+	} else if (world_3d.is_valid()) {
+		return world_3d;
+	} else if (_parent_world) {
+		return _parent_world->find_world_3d();
+	} else {
+		return Ref<World3D>();
+	}
+}
+
 World::World() {
 	world_2d = Ref<World2D>(memnew(World2D));
 }
diff --git a/scene/main/world.h b/scene/main/world.h
index 5c6f37d1a..43028605b 100644
--- a/scene/main/world.h
+++ b/scene/main/world.h
@@ -15,16 +15,15 @@ public:
 	Ref<World2D> get_world_2d() const;
 	void set_world_2d(const Ref<World2D> &p_world_2d);
 
-	Ref<World2D> find_world_2d() const;
-
 	Ref<World3D> get_world_3d() const;
 	void set_world_3d(const Ref<World3D> &p_world);
 
-	Ref<World3D> find_world_3d() const;
-
 	void set_use_own_world_3d(bool p_use_own_world_3d);
 	bool is_using_own_world_3d() const;
 
+	Ref<World2D> find_world_2d() const;
+	Ref<World3D> find_world_3d() const;
+
 	World();
 	~World();