From b9a92f1540bbfd59cb8ac8e33e1ae72c88b255dc Mon Sep 17 00:00:00 2001
From: Anthony Yakovlev <anthony@unity3d.com>
Date: Wed, 11 Mar 2026 20:56:47 +0300
Subject: [PATCH 1/3] Fix ISXB-1783: Input Actions Editor toolbar buttons no
 longer overlap when window is narrow

- Set min-width 520px on the editor root so Save Asset, Devices, Control Schemes stay visible when docked and resized.

Made-with: Cursor
---
 .../UITKAssetEditor/PackageResources/InputActionsEditor.uxml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml
index c04e070397..1365403545 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml
@@ -1,6 +1,6 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
     <Style src="project://database/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss?fileID=7433441132597879392&amp;guid=7dac9c49a90bca4499371d0adc9b617b&amp;type=3#InputActionsEditorStyles"/>
-    <ui:VisualElement name="action-editor" style="flex-direction: column; flex-grow: 1;">
+    <ui:VisualElement name="action-editor" style="flex-direction: column; flex-grow: 1; min-width: 520px;">
         <ui:VisualElement name="control-schemes-toolbar-container">
             <uie:Toolbar>
                 <ui:VisualElement style="flex-direction: row; flex-grow: 1;">

From 25e13e05191f694b9cac6589c98d079426198291 Mon Sep 17 00:00:00 2001
From: Anthony Yakovlev <anthony@unity3d.com>
Date: Thu, 12 Mar 2026 18:05:50 +0300
Subject: [PATCH 2/3] move minimum width to the styles sheet

---
 .../UITKAssetEditor/PackageResources/InputActionsEditor.uxml  | 2 +-
 .../PackageResources/InputActionsEditorStyles.uss             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml
index 1365403545..c04e070397 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditor.uxml
@@ -1,6 +1,6 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
     <Style src="project://database/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss?fileID=7433441132597879392&amp;guid=7dac9c49a90bca4499371d0adc9b617b&amp;type=3#InputActionsEditorStyles"/>
-    <ui:VisualElement name="action-editor" style="flex-direction: column; flex-grow: 1; min-width: 520px;">
+    <ui:VisualElement name="action-editor" style="flex-direction: column; flex-grow: 1;">
         <ui:VisualElement name="control-schemes-toolbar-container">
             <uie:Toolbar>
                 <ui:VisualElement style="flex-direction: row; flex-grow: 1;">
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss
index 736eac248b..509be1054c 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss
@@ -229,3 +229,7 @@
 .matching-controls-labels {
     margin: 1px;
 }
+
+#action-editor {
+    min-width: 520px;
+}

From 040baa8cba93b391ba28d729c6dbfd258f835595 Mon Sep 17 00:00:00 2001
From: Anthony Yakovlev <anthony@unity3d.com>
Date: Thu, 12 Mar 2026 18:08:58 +0300
Subject: [PATCH 3/3] add changelog

---
 Packages/com.unity.inputsystem/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
index 772dafbe0a..6268f15000 100644
--- a/Packages/com.unity.inputsystem/CHANGELOG.md
+++ b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed caching for InputControlPath display name [ISX-2501](https://jira.unity3d.com/browse/ISX-2501)
 - Fixed editor closing and not saving the input asset when clicking cancel in the dialog prompt [UUM-134748](https://jira.unity3d.com/browse/UUM-134748)
 - Fixed the input actions editor window entering a corrupt state when restarting Unity after the asset was edited. [UUM-134737](https://jira.unity3d.com/browse/UUM-134737)
+- Fixed the Input Actions Editor Window toolbar buttons overlapping each other when the window size is too small [ISXB-1783] (https://jira.unity3d.com/browse/ISXB-1783)
 
 ### Changed