diff --git a/Editor/HierarchyDrawer.cs b/Editor/HierarchyDrawer.cs
index efcfbb0..32bb4a2 100644
--- a/Editor/HierarchyDrawer.cs
+++ b/Editor/HierarchyDrawer.cs
@@ -521,12 +521,12 @@ static void DrawCore(int instanceID, Rect selectionRect)
                 var isActive = GUI.Toggle(r, wasActive, "");
                 if (wasActive != isActive)
                 {
-                    go.SetActive(isActive);
                     if (EditorApplication.isPlaying == false)
                     {
                         UnityEditor.SceneManagement.EditorSceneManager.MarkSceneDirty(go.scene);
-                        EditorUtility.SetDirty(go);
+                        Undo.RecordObject(go, isActive ? "Enabled GameObject" : "Disabled GameObject" );
                     }
+                    go.SetActive(isActive);
                 }
             }
             #endregion