diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index c5d6c7d8..4cc1e377 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -30,18 +30,6 @@ namespace SourceGit.Models
             set;
         } = string.Empty;
 
-        public bool EnableAutoFetch
-        {
-            get;
-            set;
-        } = false;
-
-        public int AutoFetchInterval
-        {
-            get;
-            set;
-        } = 10;
-
         public bool AskBeforeAutoUpdatingSubmodules
         {
             get;
diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs
index 265390d8..04ffbeb9 100644
--- a/src/ViewModels/Preferences.cs
+++ b/src/ViewModels/Preferences.cs
@@ -254,6 +254,18 @@ namespace SourceGit.ViewModels
             }
         }
 
+        public bool EnableAutoFetch
+        {
+            get;
+            set;
+        } = false;
+
+        public int AutoFetchInterval
+        {
+            get;
+            set;
+        } = 10;
+
         public bool IgnoreWhitespaceChangesInDiff
         {
             get => _ignoreWhitespaceChangesInDiff;
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 2945f7c6..7f91241f 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1887,7 +1887,7 @@ namespace SourceGit.ViewModels
 
             try
             {
-                if (_settings is not { EnableAutoFetch: true } || !CanCreatePopup())
+                if (Preferences.Instance.EnableAutoFetch || !CanCreatePopup())
                 {
                     _lastFetchTime = DateTime.Now;
                     return;
@@ -1898,7 +1898,7 @@ namespace SourceGit.ViewModels
                     return;
 
                 var now = DateTime.Now;
-                var desire = _lastFetchTime.AddMinutes(_settings.AutoFetchInterval);
+                var desire = _lastFetchTime.AddMinutes(Preferences.Instance.AutoFetchInterval);
                 if (desire > now)
                     return;
 
diff --git a/src/ViewModels/RepositoryConfigure.cs b/src/ViewModels/RepositoryConfigure.cs
index fc012561..4a129e63 100644
--- a/src/ViewModels/RepositoryConfigure.cs
+++ b/src/ViewModels/RepositoryConfigure.cs
@@ -101,26 +101,6 @@ namespace SourceGit.ViewModels
             set => _repo.Settings.AskBeforeAutoUpdatingSubmodules = value;
         }
 
-        public bool EnableAutoFetch
-        {
-            get => _repo.Settings.EnableAutoFetch;
-            set => _repo.Settings.EnableAutoFetch = value;
-        }
-
-        public int? AutoFetchInterval
-        {
-            get => _repo.Settings.AutoFetchInterval;
-            set
-            {
-                if (value is null || value < 1)
-                    return;
-
-                var interval = (int)value;
-                if (_repo.Settings.AutoFetchInterval != interval)
-                    _repo.Settings.AutoFetchInterval = interval;
-            }
-        }
-
         public AvaloniaList<Models.CommitTemplate> CommitTemplates
         {
             get => _repo.Settings.CommitTemplates;
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index 0098818c..3b2ee062 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -309,7 +309,7 @@
             <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.Git}"/>
           </TabItem.Header>
 
-          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
+          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,Auto,32" ColumnDefinitions="Auto,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
                        Text="{DynamicResource Text.Preferences.Git.Path}"
                        HorizontalAlignment="Right"
@@ -405,6 +405,26 @@
                       Content="{DynamicResource Text.Preferences.Git.UseLibsecret}"
                       IsChecked="{Binding UseLibsecretInsteadOfGCM, Mode=TwoWay}"
                       IsVisible="{OnPlatform False, Linux=True}"/>
+
+            <StackPanel Grid.Row="9" Grid.Column="1" Orientation="Horizontal">
+              <CheckBox x:Name="AutoFetchCheckBox"
+                        Content="{DynamicResource Text.Configure.Git.AutoFetch}"
+                        IsChecked="{Binding EnableAutoFetch, Mode=TwoWay}"/>
+
+              <NumericUpDown Minimum="1" Maximum="60" Increment="1"
+                             Height="26" Width="110"
+                             Margin="8,0,0,0" Padding="4"
+                             BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
+                             CornerRadius="3"
+                             ParsingNumberStyle="Integer"
+                             FormatString="0"
+                             Value="{Binding AutoFetchInterval, Mode=TwoWay, FallbackValue=10}"
+                             IsEnabled="{Binding #AutoFetchCheckBox.IsChecked}"/>
+
+              <TextBlock VerticalAlignment="Center"
+                         Margin="5,0,0,0"
+                         Text="{DynamicResource Text.Configure.Git.AutoFetchIntervalSuffix}" />
+            </StackPanel>
           </Grid>
         </TabItem>
 
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index 88d69ed4..d08052fc 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -44,7 +44,7 @@
           <TextBlock Classes="tab_header" Text="{DynamicResource Text.Configure.Git}"/>
         </TabItem.Header>
 
-        <Grid Margin="16,4,16,8" RowDefinitions="32,32,32,32,32,32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
+        <Grid Margin="16,4,16,8" RowDefinitions="32,32,32,32,32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
           <TextBlock Grid.Row="0" Grid.Column="0"
                      HorizontalAlignment="Right" VerticalAlignment="Center"
                      Margin="0,0,8,0"
@@ -179,26 +179,6 @@
           <CheckBox Grid.Row="10" Grid.Column="1"
                     Content="{DynamicResource Text.Configure.Git.AskBeforeAutoUpdatingSubmodules}"
                     IsChecked="{Binding AskBeforeAutoUpdatingSubmodules, Mode=TwoWay}"/>
-
-          <StackPanel Grid.Row="11" Grid.Column="1" Orientation="Horizontal">
-            <CheckBox x:Name="AutoFetchCheckBox"
-                      Content="{DynamicResource Text.Configure.Git.AutoFetch}"
-                      IsChecked="{Binding EnableAutoFetch, Mode=TwoWay}"/>
-
-            <NumericUpDown Minimum="1" Maximum="60" Increment="1"
-                           Height="26" Width="110"
-                           Margin="8,0,0,0" Padding="4"
-                           BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
-                           CornerRadius="3"
-                           ParsingNumberStyle="Integer"
-                           FormatString="0"
-                           Value="{Binding AutoFetchInterval, Mode=TwoWay, FallbackValue=10}"
-                           IsEnabled="{Binding #AutoFetchCheckBox.IsChecked}"/>
-
-            <TextBlock VerticalAlignment="Center"
-                       Margin="5,0,0,0"
-                       Text="{DynamicResource Text.Configure.Git.AutoFetchIntervalSuffix}" />
-          </StackPanel>
         </Grid>
       </TabItem>