From d70866bce86ed7a65c20fc4dda39c44395f9c800 Mon Sep 17 00:00:00 2001
From: kobewi <kobewi4e@gmail.com>
Date: Thu, 15 Jan 2026 16:46:32 +0100
Subject: [PATCH] Fix TileSet dock becoming focused when switching
 TileMapLayers

---
 editor/scene/2d/tiles/tiles_editor_plugin.cpp | 6 +++++-
 editor/scene/2d/tiles/tiles_editor_plugin.h   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/editor/scene/2d/tiles/tiles_editor_plugin.cpp b/editor/scene/2d/tiles/tiles_editor_plugin.cpp
index be62e8275f..14c474775e 100644
--- a/editor/scene/2d/tiles/tiles_editor_plugin.cpp
+++ b/editor/scene/2d/tiles/tiles_editor_plugin.cpp
@@ -411,7 +411,7 @@ void TileMapEditorPlugin::_edit_tile_map_layer(TileMapLayer *p_tile_map_layer, b
 	Ref<TileSet> tile_set = p_tile_map_layer->get_tile_set();
 	if (tile_set.is_valid()) {
 		tile_set_plugin_singleton->edit(tile_set.ptr());
-		tile_set_plugin_singleton->make_visible(true);
+		tile_set_plugin_singleton->open_editor();
 		tile_set_id = tile_set->get_instance_id();
 	} else {
 		tile_set_plugin_singleton->edit(nullptr);
@@ -540,6 +540,10 @@ void TileSetEditorPlugin::make_visible(bool p_visible) {
 	}
 }
 
+void TileSetEditorPlugin::open_editor() {
+	editor->open();
+}
+
 ObjectID TileSetEditorPlugin::get_edited_tileset() const {
 	return edited_tileset;
 }
diff --git a/editor/scene/2d/tiles/tiles_editor_plugin.h b/editor/scene/2d/tiles/tiles_editor_plugin.h
index b5c33253e8..ebd438b090 100644
--- a/editor/scene/2d/tiles/tiles_editor_plugin.h
+++ b/editor/scene/2d/tiles/tiles_editor_plugin.h
@@ -164,6 +164,7 @@ public:
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
 	virtual void make_visible(bool p_visible) override;
+	void open_editor();
 
 	ObjectID get_edited_tileset() const;