diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14288df..96798a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -   Allow BuildActions to draw custom serialized property fields
 
+### Changed
+
+-   Use `EditorGUILayout.DropdownButton` for UI dropdown buttons
+
 ## [1.0.0] - 2021-04-15
 
 This release includes all changes from 1.0.0 pre-releases ([1.0.0-pre.1](#100-pre1---2021-04-09), [1.0.0-pre.2](#100-pre2---2021-04-13)), plus:
diff --git a/Editor/Build/UI/UnityBuildGUIUtility.cs b/Editor/Build/UI/UnityBuildGUIUtility.cs
index fc96604..4ee51ac 100644
--- a/Editor/Build/UI/UnityBuildGUIUtility.cs
+++ b/Editor/Build/UI/UnityBuildGUIUtility.cs
@@ -91,10 +91,9 @@ public static void DropdownHeader(string content, ref bool showDropdown, bool no
             if (!noColor)
                 GUI.backgroundColor = instance._mainHeaderColor;
 
-            if (GUILayout.Button(content, dropdownHeaderStyle, options))
+            if (EditorGUILayout.DropdownButton(new GUIContent(content), FocusType.Keyboard, dropdownHeaderStyle, options))
             {
                 showDropdown = !showDropdown;
-                GUIUtility.keyboardControl = 0;
             }
 
             if (!noColor)