From d12d955e68a38db4a8f2db8ecd715481596e3351 Mon Sep 17 00:00:00 2001
From: Chia-Hsiang Cheng <88014292+garychia@users.noreply.github.com>
Date: Sun, 10 Sep 2023 17:16:09 +0800
Subject: [PATCH] Avoid changing the currently edited object when attaching a
 script

---
 editor/scene_tree_dock.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index 161598b50fab..69d57a555c34 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -2089,8 +2089,13 @@ void SceneTreeDock::_script_created(Ref<Script> p_script) {
 	}
 	undo_redo->commit_action();
 
+	// Avoid changing the currently edited object.
+	Object *edited_object = InspectorDock::get_inspector_singleton()->get_edited_object();
+
 	_push_item(p_script.ptr());
 	_update_script_button();
+
+	InspectorDock::get_inspector_singleton()->edit(edited_object);
 }
 
 void SceneTreeDock::_shader_created(Ref<Shader> p_shader) {