diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index e6846978dc..93a6c203c9 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -110,11 +110,11 @@ namespace Avalonia.Controls
         {
             if (Child != null)
             {
-                var padding = Padding + BorderThickness;                
+                var padding = Padding + BorderThickness;
                 Child.Arrange(new Rect(finalSize).Deflate(padding));
             }
 
-            _borderRenderHelper.Update(finalSize, BorderThickness, CornerRadius);           
+            _borderRenderHelper.Update(finalSize, BorderThickness, CornerRadius);
 
             return finalSize;
         }
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 1c5883d980..ce8fe52c22 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -383,10 +383,10 @@ namespace Avalonia.Controls.Presenters
             {
                 size = size.WithWidth(Math.Min(size.Width, DesiredSize.Width - padding.Left - padding.Right));
             }
-            
+
             if (verticalContentAlignment != VerticalAlignment.Stretch)
             {
-                size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - padding.Top - padding.Bottom));                
+                size = size.WithHeight(Math.Min(size.Height, DesiredSize.Height - padding.Top - padding.Bottom));
             }
 
             if (useLayoutRounding)
diff --git a/tests/Avalonia.Controls.UnitTests/BorderTests.cs b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
index 9d6c838bc3..9a6a041ec7 100644
--- a/tests/Avalonia.Controls.UnitTests/BorderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
@@ -33,11 +33,11 @@ namespace Avalonia.Controls.UnitTests
                 MaxWidth = 12,
                 Child = content = new Border
                 {
-                     Height = 0,
-                     Width = 0
+                    Height = 0,
+                    Width = 0
                 }
             };
-            
+
             target.Arrange(new Rect(0, 0, 100, 100));
 
             Assert.Equal(new Rect(6, 6, 0, 0), content.Bounds);