diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
index 6846103aff..feafa1980d 100644
--- a/Packages/com.unity.inputsystem/CHANGELOG.md
+++ b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -68,6 +68,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed duplication of project wide input actions when loading/unloading scenes.
 - Fixed an issue in the Input Action Editor window where entries being cut would be deleted instantly and not after being pasted.
 - Fixed an issue where preloaded InputActionAsset objects added by a Unity developer could accidentally be selected as the project-wide actions asset instead of the configured asset in built players.
+- Fixed an issue where aliased enum values for ´GamepadButton´ would be seemingly randomly picked from an Inspector value picker. This is resolved with a custom property drawer that maps to a designated aliased type. [ISXB-543](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-543).
 
 ## [1.8.0-pre.2] - 2023-11-09
 
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/EnumPropertyDrawer.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/EnumPropertyDrawer.cs
new file mode 100644
index 0000000000..262738d754
--- /dev/null
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/EnumPropertyDrawer.cs
@@ -0,0 +1,60 @@
+#if UNITY_EDITOR
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine.UIElements;
+
+namespace UnityEngine.InputSystem.Editor
+{
+    /// <summary>
+    /// Abstract base class for a generic property drawer for aliased enums.
+    /// </summary>
+    internal abstract class AliasedEnumPropertyDrawer<T> : PropertyDrawer where T : Enum
+    {
+        private string[] m_EnumDisplayNames;
+
+        protected abstract string GetNonAliasedNames(string enumValue);
+
+        private void Initialize()
+        {
+            var enumNamesAndValues = new Dictionary<string, int>();
+            var enumDisplayNames = Enum.GetNames(typeof(T));
+            var enumValues = Enum.GetValues(typeof(T)).Cast<T>().ToArray();
+            var enumStringValues = enumValues.Select(v => v.ToString()).ToArray();
+
+            for (var i = 0; i < enumDisplayNames.Length; ++i)
+            {
+                var enumName = enumDisplayNames[i];
+                var aliasedName = GetNonAliasedNames(enumStringValues[i]);
+                if (!string.IsNullOrEmpty(aliasedName) && enumName != aliasedName)
+                    enumName = $"{enumName} ({aliasedName})";
+
+                enumNamesAndValues.Add(enumName, (int)enumValues.GetValue(i));
+            }
+
+            var sortedEntries = enumNamesAndValues
+                .OrderBy(x => x.Value)
+                .ThenBy(x => x.Key.Contains("("));
+
+            m_EnumDisplayNames = sortedEntries.Select(x => x.Key).ToArray();
+        }
+
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            EditorGUI.BeginProperty(position, label, property);
+
+            if (property.propertyType == SerializedPropertyType.Enum)
+            {
+                if (m_EnumDisplayNames == null)
+                    Initialize();
+
+                property.enumValueIndex = EditorGUI.Popup(position, label.text, property.enumValueIndex, m_EnumDisplayNames);
+            }
+
+            EditorGUI.EndProperty();
+        }
+    }
+}
+ #endif // UNITY_EDITOR
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/EnumPropertyDrawer.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/EnumPropertyDrawer.cs.meta
new file mode 100644
index 0000000000..3316a21c24
--- /dev/null
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/EnumPropertyDrawer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 578041934f9694948bbdaab9f133b85f
\ No newline at end of file
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs
new file mode 100644
index 0000000000..3b22fcbb83
--- /dev/null
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs
@@ -0,0 +1,43 @@
+#if UNITY_EDITOR
+
+using UnityEditor;
+using UnityEngine.InputSystem.LowLevel;
+
+namespace UnityEngine.InputSystem.Editor
+{
+    /// <summary>
+    /// Property drawer for <see cref = "GamepadButton" />
+    /// </summary >
+    [CustomPropertyDrawer(typeof(GamepadButton))]
+    internal class GpadButtonPropertyDrawer : AliasedEnumPropertyDrawer<GamepadButton>
+    {
+        protected override string GetNonAliasedNames(string name)
+        {
+            switch (name)
+            {
+                case nameof(GamepadButton.North):
+                case nameof(GamepadButton.Y):
+                case nameof(GamepadButton.Triangle):
+                    return nameof(GamepadButton.North);
+
+                case nameof(GamepadButton.South):
+                case nameof(GamepadButton.A):
+                case nameof(GamepadButton.Cross):
+                    return nameof(GamepadButton.South);
+
+                case nameof(GamepadButton.East):
+                case nameof(GamepadButton.B):
+                case nameof(GamepadButton.Circle):
+                    return nameof(GamepadButton.East);
+
+                case nameof(GamepadButton.West):
+                case nameof(GamepadButton.X):
+                case nameof(GamepadButton.Square):
+                    return nameof(GamepadButton.West);
+
+                default: return string.Empty;
+            }
+        }
+    }
+}
+#endif // UNITY_EDITOR
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs.meta
new file mode 100644
index 0000000000..2194273b9d
--- /dev/null
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/GamepadButtonPropertyDrawer.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: dbfe7102f5cf44ce875297b9f395dd65
+timeCreated: 1709195897
\ No newline at end of file