diff --git a/src/ViewModels/PopupHost.cs b/src/ViewModels/PopupHost.cs
index b6351fcb..1a4c8bb2 100644
--- a/src/ViewModels/PopupHost.cs
+++ b/src/ViewModels/PopupHost.cs
@@ -52,17 +52,13 @@ namespace SourceGit.ViewModels
                 if (task != null)
                 {
                     var finished = await task;
+                    _popup.InProgress = false;
                     if (finished)
-                    {
                         Popup = null;
-                    }
-                    else
-                    {
-                        _popup.InProgress = false;
-                    }
                 }
                 else
                 {
+                    _popup.InProgress = false;
                     Popup = null;
                 }
             }
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 05eca820..a9202d99 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -317,23 +317,9 @@
                   </StackPanel>
 
                   <!-- Running -->
-                  <StackPanel Orientation="Vertical" Margin="8" IsVisible="{Binding InProgress}">
-                    <Rectangle Height="1" Margin="-8,0" HorizontalAlignment="Stretch" Fill="{DynamicResource Brush.Border1}" />
-                    <StackPanel Orientation="Horizontal" Margin="0,8">
-                      <Path Width="12" Height="12" Classes="waiting" Data="{StaticResource Icons.Waiting}" IsVisible="{Binding InProgress}"/>
-                      <TextBlock Margin="6,0,0,0" FontSize="14" FontWeight="Bold" Text="{DynamicResource Text.Running}"/>
-                    </StackPanel>
-                    <TextBlock HorizontalAlignment="Stretch"
-                               TextWrapping="Wrap"
-                               FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:FontSizeModifyConverters.Decrease}}"
-                               FontStyle="Italic"
-                               Text="{Binding ProgressDescription}"/>
-                    <ProgressBar Margin="0,8,0,0"
-                                 HorizontalAlignment="Stretch"
-                                 IsIndeterminate="True"
-                                 Background="{DynamicResource Brush.FG2}" Foreground="{DynamicResource Brush.Accent}"
-                                 Minimum="0" Maximum="100"/>
-                  </StackPanel>
+                  <v:PopupRunningStatus Margin="8"
+                                        Description="{Binding ProgressDescription}"
+                                        IsVisible="{Binding InProgress}"/>
                 </StackPanel>
               </Border>
             </DataTemplate>
diff --git a/src/Views/LoadingIcon.axaml.cs b/src/Views/LoadingIcon.axaml.cs
index c7c6fd14..5a7e0014 100644
--- a/src/Views/LoadingIcon.axaml.cs
+++ b/src/Views/LoadingIcon.axaml.cs
@@ -17,7 +17,9 @@ namespace SourceGit.Views
         protected override void OnLoaded(RoutedEventArgs e)
         {
             base.OnLoaded(e);
-            StartAnim();
+
+            if (IsVisible) 
+                StartAnim();
         }
 
         protected override void OnUnloaded(RoutedEventArgs e)
diff --git a/src/Views/PopupRunningStatus.axaml b/src/Views/PopupRunningStatus.axaml
new file mode 100644
index 00000000..c2759715
--- /dev/null
+++ b/src/Views/PopupRunningStatus.axaml
@@ -0,0 +1,31 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:c="using:SourceGit.Converters"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="SourceGit.Views.PopupRunningStatus"
+             x:Name="me">
+  <StackPanel Orientation="Vertical">
+    <Rectangle Height="1" Margin="-8,0" HorizontalAlignment="Stretch" Fill="{DynamicResource Brush.Border1}" />
+    
+    <StackPanel Orientation="Horizontal" Margin="0,8">
+      <ContentPresenter x:Name="icon" Width="12" Height="12"/>
+      <TextBlock Margin="6,0,0,0" FontSize="14" FontWeight="Bold" Text="{DynamicResource Text.Running}"/>
+    </StackPanel>
+    
+    <TextBlock x:Name="txtDesc"
+               HorizontalAlignment="Stretch"
+               TextWrapping="Wrap"
+               FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:FontSizeModifyConverters.Decrease}}"
+               FontStyle="Italic"
+               Text="{Binding #me.Description}"/>
+    
+    <ProgressBar x:Name="progressBar"
+                 Margin="0,8,0,0"
+                 HorizontalAlignment="Stretch"
+                 Background="{DynamicResource Brush.FG2}" Foreground="{DynamicResource Brush.Accent}"
+                 Minimum="0" Maximum="100"/>
+  </StackPanel>
+</UserControl>
diff --git a/src/Views/PopupRunningStatus.axaml.cs b/src/Views/PopupRunningStatus.axaml.cs
new file mode 100644
index 00000000..e9a77a04
--- /dev/null
+++ b/src/Views/PopupRunningStatus.axaml.cs
@@ -0,0 +1,70 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+
+namespace SourceGit.Views
+{
+    public partial class PopupRunningStatus : UserControl
+    {
+        public static readonly StyledProperty<string> DescriptionProperty =
+            AvaloniaProperty.Register<PopupRunningStatus, string>(nameof(Description));
+
+        public string Description
+        {
+            get => GetValue(DescriptionProperty);
+            set => SetValue(DescriptionProperty, value);
+        }
+
+        public PopupRunningStatus()
+        {
+            InitializeComponent();
+        }
+
+        protected override void OnLoaded(RoutedEventArgs e)
+        {
+            base.OnLoaded(e);
+
+            if (IsVisible)
+                StartAnim();
+        }
+
+        protected override void OnUnloaded(RoutedEventArgs e)
+        {
+            StopAnim();
+            base.OnUnloaded(e);
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == IsVisibleProperty)
+            {
+                if (IsVisible)
+                    StartAnim();
+                else
+                    StopAnim();
+            }
+        }
+
+        private void StartAnim()
+        {
+            icon.Content = new Path()
+            {
+                Data = this.FindResource("Icons.Loading") as StreamGeometry,
+                Classes = { "rotating" },
+            };
+            progressBar.IsIndeterminate = true;
+        }
+
+        private void StopAnim()
+        {
+            if (icon.Content is Path path)
+                path.Classes.Clear();
+            icon.Content = null;
+            progressBar.IsIndeterminate = false;
+        }
+    }
+}