diff --git a/Editor/UX/UXButtonEditor.cs b/Editor/UX/UXButtonEditor.cs
index d6a5a36..e5dbf3e 100644
--- a/Editor/UX/UXButtonEditor.cs
+++ b/Editor/UX/UXButtonEditor.cs
@@ -342,12 +342,19 @@ internal class UXButtonEditor : Editor
         float spacing = 2f;
         float y = position.y;
 
-        Rect targetRect = new Rect(position.x, y, position.width, lineHeight);
-        EditorGUI.PropertyField(targetRect, targetGraphic);
-        y += lineHeight + spacing;
-
         var currentTransition = GetTransition(transition);
 
+        switch (currentTransition)
+        {
+            case Selectable.Transition.ColorTint:
+            case Selectable.Transition.SpriteSwap:
+                Rect targetRect = new Rect(position.x, y, position.width, lineHeight);
+                EditorGUI.PropertyField(targetRect, targetGraphic);
+                y += lineHeight + spacing;
+                break;
+        }
+
+
         Rect transitionRect = new Rect(position.x, y, position.width, lineHeight);
         EditorGUI.PropertyField(transitionRect, transition);
         y += lineHeight + spacing;
@@ -418,14 +425,19 @@ internal class UXButtonEditor : Editor
             targetGraphic.objectReferenceValue = graphic;
         }
 
-
-        EditorGUILayout.PropertyField(targetGraphic);
-
         SerializedProperty transition = m_TransitionData.FindPropertyRelative("transition");
-        EditorGUILayout.PropertyField(transition);
-
         var currentTransition = GetTransition(transition);
 
+        switch (currentTransition)
+        {
+            case Selectable.Transition.ColorTint:
+            case Selectable.Transition.SpriteSwap:
+                EditorGUILayout.PropertyField(targetGraphic);
+                break;
+        }
+
+        EditorGUILayout.PropertyField(transition);
+
         var animator = graphic != null ? graphic.GetComponent<Animator>() : null;
         switch (currentTransition)
         {