diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/InternetViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/InternetViewModel.cs
index 0f8249f65..b2e0f3c6a 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/InternetViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/InternetViewModel.cs
@@ -34,7 +34,7 @@ public SettingsCard BuildCredentialsCard()
     {
         _savingIndicator = new ProgressBar
         {
-            IsIndeterminate = true,
+            IsIndeterminate = false,
             Opacity = 0,
             Margin = new Thickness(0, -8, 0, 0),
         };
@@ -172,6 +172,7 @@ private async Task SaveCredentialsAsync()
     {
         if (_usernameBox is null || _passwordBox is null || _savingIndicator is null) return;
         _savingIndicator.Opacity = 1;
+        _savingIndicator.IsIndeterminate = true;
         string u = _usernameBox.Text ?? "";
         string p = _passwordBox.Text ?? "";
         await Task.Delay(500);
@@ -180,6 +181,7 @@ private async Task SaveCredentialsAsync()
         CoreSettings.SetProxyCredentials(u, p);
         InternetViewModel.ApplyProxyToProcess();
         _savingIndicator.Opacity = 0;
+        _savingIndicator.IsIndeterminate = false;
     }
 
     [RelayCommand]
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
index 89dcf79f7..2e3bab453 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
@@ -96,12 +96,14 @@ public SecureCheckboxCard()
         };
         _loading = new ProgressBar
         {
-            IsIndeterminate = true,
+            IsIndeterminate = false,
             IsVisible = false,
             Width = 20,
             Height = 20,
             Margin = new Thickness(0, 0, 4, 0),
         };
+        // Keep the indeterminate clock off while hidden so it doesn't pin the render loop.
+        _loading.Bind(ProgressBar.IsIndeterminateProperty, _loading.GetObservable(Visual.IsVisibleProperty));
         _textblock = new TextBlock
         {
             VerticalAlignment = VerticalAlignment.Center,
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
index e4ff126eb..cde1c13c2 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
@@ -101,7 +101,7 @@
 
     <Grid>
         <!-- Loading indicator across the very top -->
-        <ProgressBar IsIndeterminate="True"
+        <ProgressBar IsIndeterminate="{Binding IsLoading}"
                      IsVisible="{Binding IsLoading}"
                      automation:AutomationProperties.Name="{Binding PackageName}"
                      VerticalAlignment="Top"
diff --git a/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml b/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml
index 53e02c0bc..ed75c0020 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml
@@ -91,7 +91,7 @@
         <!-- Progress bar shown while navigating -->
         <ProgressBar Grid.Row="1"
                      x:Name="NavProgressBar"
-                     IsIndeterminate="True"
+                     IsIndeterminate="{Binding IsVisible, RelativeSource={RelativeSource Self}}"
                      IsVisible="False"
                      Height="2"
                      CornerRadius="0"
diff --git a/src/UniGetUI.Avalonia/Views/Pages/ReleaseNotesPage.axaml b/src/UniGetUI.Avalonia/Views/Pages/ReleaseNotesPage.axaml
index c6f2760fb..55b8032d1 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/ReleaseNotesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/ReleaseNotesPage.axaml
@@ -36,7 +36,7 @@
         <!-- Progress bar shown while navigating -->
         <ProgressBar Grid.Row="1"
                      x:Name="NavProgressBar"
-                     IsIndeterminate="True"
+                     IsIndeterminate="{Binding IsVisible, RelativeSource={RelativeSource Self}}"
                      IsVisible="False"
                      Height="2"
                      CornerRadius="0"
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml
index 81c029730..d6a25ad4c 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml
@@ -38,7 +38,7 @@
                             IsEnabled="{Binding !IsLoading}"
                             Margin="4,0,0,0"/>
                 </Grid>
-                <ProgressBar IsIndeterminate="True"
+                <ProgressBar IsIndeterminate="{Binding IsLoading}"
                              IsVisible="{Binding IsLoading}"
                              Height="4"/>
             </StackPanel>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml
index b2034fe42..4d6b84d79 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml
@@ -46,7 +46,7 @@
         </Grid>
 
         <!-- Loading indicator -->
-        <ProgressBar IsIndeterminate="True"
+        <ProgressBar IsIndeterminate="{Binding IsLoading}"
                      IsVisible="{Binding IsLoading}"
                      Height="4"/>
 
diff --git a/src/UniGetUI.Avalonia/Views/SidebarView.axaml b/src/UniGetUI.Avalonia/Views/SidebarView.axaml
index 872d3e693..61e47a35b 100644
--- a/src/UniGetUI.Avalonia/Views/SidebarView.axaml
+++ b/src/UniGetUI.Avalonia/Views/SidebarView.axaml
@@ -40,7 +40,7 @@
                                    VerticalAlignment="Center"
                                    IsVisible="{Binding $parent[local:SidebarView].ShowLabels}"/>
                     </StackPanel>
-                    <ProgressBar IsIndeterminate="True"
+                    <ProgressBar IsIndeterminate="{Binding DiscoverIsLoading}"
                                  IsVisible="{Binding DiscoverIsLoading}"
                                  Height="2"
                                  Width="32"
@@ -82,7 +82,7 @@
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"/>
                     </Border>
-                    <ProgressBar IsIndeterminate="True"
+                    <ProgressBar IsIndeterminate="{Binding UpdatesIsLoading}"
                                  IsVisible="{Binding UpdatesIsLoading}"
                                  Height="2"
                                  Width="32"
@@ -107,7 +107,7 @@
                                    VerticalAlignment="Center"
                                    IsVisible="{Binding $parent[local:SidebarView].ShowLabels}"/>
                     </StackPanel>
-                    <ProgressBar IsIndeterminate="True"
+                    <ProgressBar IsIndeterminate="{Binding InstalledIsLoading}"
                                  IsVisible="{Binding InstalledIsLoading}"
                                  Height="2"
                                  Width="32"
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
index 2b6d10450..81f356252 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
@@ -459,7 +459,7 @@
 
                 <!-- Loading indicator -->
                 <ProgressBar x:Name="LoadingProgressBar"
-                             IsIndeterminate="True"
+                             IsIndeterminate="{Binding IsLoading}"
                              IsVisible="{Binding IsLoading}"
                              automation:AutomationProperties.Name="{t:Translate Loading}"
                              Height="4"