diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 87fabf5ed7..9cd7a19e7e 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -208,9 +208,11 @@ namespace Avalonia.Controls
 
         protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
-            if (_hotkey != null)
-                // Control attached again, set Hotkey to create a hotkey manager for this control
+            if (_hotkey != null) // Control attached again, set Hotkey to create a hotkey manager for this control
+            {
                 HotKey = _hotkey;
+            }
+            
             base.OnAttachedToLogicalTree(e);
 
             if (Command != null)
@@ -221,9 +223,9 @@ namespace Avalonia.Controls
 
         protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
+            // This will cause the hotkey manager to dispose the observer and the reference to this control
             if (HotKey != null)
             {
-                // This will cause the hotkey manager to dispose the observer and the reference to this control
                 _hotkey = HotKey;
                 HotKey = null;
             }
diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs
index faf92c97fe..8612f696bc 100644
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@@ -338,9 +338,11 @@ namespace Avalonia.Controls
 
         protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
-            if (_hotkey != null)
-                // Control attached again, set Hotkey to create a hotkey manager for this control
+            if (_hotkey != null) // Control attached again, set Hotkey to create a hotkey manager for this control
+            {
                 HotKey = _hotkey;
+            }
+            
             base.OnAttachedToLogicalTree(e);
 
             if (Command != null)
@@ -351,9 +353,9 @@ namespace Avalonia.Controls
 
         protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
+            // This will cause the hotkey manager to dispose the observer and the reference to this control
             if (HotKey != null)
             {
-                // This will cause the hotkey manager to dispose the observer and the reference to this control
                 _hotkey = HotKey;
                 HotKey = null;
             }