diff --git a/src/Dock.Avalonia/Controls/ToolChromeControl.axaml.cs b/src/Dock.Avalonia/Controls/ToolChromeControl.axaml.cs
index fb47f61e7..5c1a88c61 100644
--- a/src/Dock.Avalonia/Controls/ToolChromeControl.axaml.cs
+++ b/src/Dock.Avalonia/Controls/ToolChromeControl.axaml.cs
@@ -141,6 +141,9 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         CloseButton = e.NameScope.Find<Button>("PART_CloseButton");
         AddHandler(PointerPressedEvent, PressedHandler, RoutingStrategies.Tunnel);
         AttachToWindow();
+
+        var maximizeRestoreButton = e.NameScope.Get<Button>("PART_MaximizeRestoreButton");
+        maximizeRestoreButton.Click += OnMaximizeRestoreButtonClicked;
     }
 
     private void AttachToWindow()
@@ -157,9 +160,6 @@ private void AttachToWindow()
 
             SetCurrentValue(IsFloatingProperty, true);
         }
-
-        var maximizeRestoreButton = e.NameScope.Get<Button>("PART_MaximizeRestoreButton");
-        maximizeRestoreButton.Click += OnMaximizeRestoreButtonClicked;
     }
 
     private void OnMaximizeRestoreButtonClicked(object? sender, RoutedEventArgs e)