diff --git a/Editor/Inspector/Menu/ToggleCreatorShortcut.cs b/Editor/Inspector/Menu/ToggleCreatorShortcut.cs
index 3a65f9c4..ca5fcc0b 100644
--- a/Editor/Inspector/Menu/ToggleCreatorShortcut.cs
+++ b/Editor/Inspector/Menu/ToggleCreatorShortcut.cs
@@ -9,23 +9,16 @@ namespace nadena.dev.modular_avatar.core.editor
     internal static class ToggleCreatorShortcut
     {
         [MenuItem(UnityMenuItems.GameObject_SetupToggle, false, UnityMenuItems.GameObject_SetupToggleOrder)]
-        private static void SetupToggle() => CreateToggles(true);
+        private static void SetupToggle(MenuCommand command) => CreateToggleImpl(command, true);
 
         [MenuItem(UnityMenuItems.GameObject_CreateToggle, false, UnityMenuItems.GameObject_CreateToggleOrder)]
-        private static void CreateToggle() => CreateToggles(false);
+        private static void CreateToggle(MenuCommand command) => CreateToggleImpl(command, false);
         
-        private static void CreateToggles(bool setup)
+        private static void CreateToggleImpl(MenuCommand command, bool setup)
         {
-            var selections = Selection.objects;
-            foreach (var selection in selections) {
-                if (selection == null) continue;
-                CreateToggleImpl(selection as GameObject, setup);
-            }
-            Selection.objects = null;
-        }
+            var selected = command.context as GameObject;
+            if (selected == null) return;
 
-        private static void CreateToggleImpl(GameObject selected, bool setup)
-        {
             var avatarRoot = RuntimeUtil.FindAvatarTransformInParents(selected.transform);
             if (avatarRoot == null) return;