diff --git a/src/Views/PopupRunningStatus.axaml b/src/Views/PopupRunningStatus.axaml
index a8467415..6a0dbdb4 100644
--- a/src/Views/PopupRunningStatus.axaml
+++ b/src/Views/PopupRunningStatus.axaml
@@ -15,8 +15,7 @@
       <TextBlock Margin="6,0,0,0" FontSize="14" FontWeight="Bold" Text="{DynamicResource Text.Running}"/>
     </StackPanel>
 
-    <TextBlock x:Name="TxtDesc"
-               HorizontalAlignment="Stretch"
+    <TextBlock HorizontalAlignment="Stretch"
                TextWrapping="Wrap"
                FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
                FontStyle="Italic"
diff --git a/src/Views/PopupRunningStatus.axaml.cs b/src/Views/PopupRunningStatus.axaml.cs
index 007ff71a..8a59d87b 100644
--- a/src/Views/PopupRunningStatus.axaml.cs
+++ b/src/Views/PopupRunningStatus.axaml.cs
@@ -21,17 +21,9 @@ namespace SourceGit.Views
             InitializeComponent();
         }
 
-        protected override void OnLoaded(RoutedEventArgs e)
-        {
-            base.OnLoaded(e);
-
-            if (IsVisible)
-                StartAnim();
-        }
-
         protected override void OnUnloaded(RoutedEventArgs e)
         {
-            StopAnim();
+            _isUnloading = true;
             base.OnUnloaded(e);
         }
 
@@ -41,7 +33,7 @@ namespace SourceGit.Views
 
             if (change.Property == IsVisibleProperty)
             {
-                if (IsVisible)
+                if (IsVisible && !_isUnloading)
                     StartAnim();
                 else
                     StopAnim();
@@ -61,5 +53,7 @@ namespace SourceGit.Views
             Icon.Content = null;
             ProgressBar.IsIndeterminate = false;
         }
+
+        private bool _isUnloading = false;
     }
 }