diff --git a/src/Avalonia.Controls/ProgressBar.cs b/src/Avalonia.Controls/ProgressBar.cs
index af152cf247..a42d793ff1 100644
--- a/src/Avalonia.Controls/ProgressBar.cs
+++ b/src/Avalonia.Controls/ProgressBar.cs
@@ -24,6 +24,9 @@ namespace Avalonia.Controls
         private static readonly StyledProperty<double> IndeterminateStartingOffsetProperty =
             AvaloniaProperty.Register<ProgressBar, double>(nameof(IndeterminateStartingOffset));
 
+        private static readonly StyledProperty<double> IndeterminateEndingOffsetProperty =
+            AvaloniaProperty.Register<ProgressBar, double>(nameof(IndeterminateEndingOffset));
+
         private Border _indicator;
 
         static ProgressBar()
@@ -53,6 +56,12 @@ namespace Avalonia.Controls
             set => SetValue(IndeterminateStartingOffsetProperty, value);
         }
 
+        private double IndeterminateEndingOffset
+        {
+            get => GetValue(IndeterminateEndingOffsetProperty);
+            set => SetValue(IndeterminateEndingOffsetProperty, value);
+        }
+
         /// <inheritdoc/>
         protected override Size ArrangeOverride(Size finalSize)
         {
@@ -79,12 +88,15 @@ namespace Avalonia.Controls
                         var width = bounds.Width / 5.0;
                         IndeterminateStartingOffset = -width;
                         _indicator.Width = width;
+                        IndeterminateEndingOffset = bounds.Width;
+
                     }
                     else
                     {
                         var height = bounds.Height / 5.0;
-                        IndeterminateStartingOffset = -height;
+                        IndeterminateStartingOffset = -bounds.Height;
                         _indicator.Height = height;
+                        IndeterminateEndingOffset = height;
                     }
                 }
                 else
diff --git a/src/Avalonia.Themes.Default/ProgressBar.xaml b/src/Avalonia.Themes.Default/ProgressBar.xaml
index df735e2048..c4cbfed350 100644
--- a/src/Avalonia.Themes.Default/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Default/ProgressBar.xaml
@@ -7,11 +7,9 @@
         <Border Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}">
-          <Canvas>
-            <Border Name="PART_Indicator"
-                    BorderThickness="1"
-                    Background="{TemplateBinding Foreground}"/>
-          </Canvas>
+          <Border Name="PART_Indicator"
+                  BorderThickness="1"
+                  Background="{TemplateBinding Foreground}"/>
         </Border>
       </ControlTemplate>
     </Setter>
@@ -19,12 +17,10 @@
   <Style Selector="ProgressBar:horizontal /template/ Border#PART_Indicator">
     <Setter Property="HorizontalAlignment" Value="Left"/>
     <Setter Property="VerticalAlignment" Value="Stretch"/>
-    <Setter Property="Height" Value="{Binding Bounds.Height, RelativeSource={RelativeSource TemplatedParent}}" />
   </Style>
   <Style Selector="ProgressBar:vertical /template/ Border#PART_Indicator">
     <Setter Property="HorizontalAlignment" Value="Stretch"/>
     <Setter Property="VerticalAlignment" Value="Bottom"/>
-    <Setter Property="Width" Value="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}" />
   </Style>
   <Style Selector="ProgressBar:horizontal">
     <Setter Property="MinWidth" Value="200"/>
@@ -40,10 +36,12 @@
                      RepeatCount="Loop"
                      Easing="LinearEasing">
               <KeyFrame Cue="0%">
-                  <Setter Property="Canvas.Left" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+                  <Setter Property="TranslateTransform.X"
+                          Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
               </KeyFrame>
               <KeyFrame Cue="100%">
-                  <Setter Property="Canvas.Left" Value="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}" />
+                  <Setter Property="TranslateTransform.X"
+                          Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
               </KeyFrame>
       </Animation>
       </Style.Animations>
@@ -54,10 +52,12 @@
                      RepeatCount="Loop"
                      Easing="LinearEasing">
               <KeyFrame Cue="0%">
-                  <Setter Property="Canvas.Top" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+                  <Setter Property="TranslateTransform.Y"
+                          Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
               </KeyFrame>
               <KeyFrame Cue="100%">
-                  <Setter Property="Canvas.Top" Value="{Binding Bounds.Height, RelativeSource={RelativeSource TemplatedParent}}" />
+                  <Setter Property="TranslateTransform.Y"
+                          Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
               </KeyFrame>
       </Animation>
       </Style.Animations>