diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs
index 25bbb431f..d27f8f28c 100644
--- a/src/ViewModels/Preferences.cs
+++ b/src/ViewModels/Preferences.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Avalonia.Collections;
+using Avalonia.Media;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
@@ -61,6 +63,8 @@ public string ThemeOverrides
             }
         }
 
+        public IEnumerable<string> Fonts => FontManager.Current.SystemFonts.Select(f => f.FamilyNames.FirstOrDefault());
+
         public string DefaultFontFamily
         {
             get => _defaultFontFamily;
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index b0a4753bb..5bad18123 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -210,19 +210,25 @@
                        Text="{DynamicResource Text.Preferences.Appearance.DefaultFont}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
-            <TextBox Grid.Row="1" Grid.Column="1"
-                     Height="28"
-                     CornerRadius="3"
-                     Text="{Binding DefaultFontFamily, Mode=TwoWay}"/>
+            <ComboBox Grid.Row="1" Grid.Column="1"
+                      Height="28"
+                      HorizontalAlignment="Stretch"
+                      Padding="8,0"
+                      CornerRadius="3"
+                      ItemsSource="{Binding Fonts, Mode=OneWay}"
+                      SelectedItem="{Binding DefaultFontFamily, Mode=TwoWay}"/>
 
             <TextBlock Grid.Row="2" Grid.Column="0"
                        Text="{DynamicResource Text.Preferences.Appearance.MonospaceFont}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
-            <TextBox Grid.Row="2" Grid.Column="1"
+            <ComboBox Grid.Row="2" Grid.Column="1"
                      Height="28"
+                     HorizontalAlignment="Stretch"
+                     Padding="8,0"
                      CornerRadius="3"
-                     Text="{Binding MonospaceFontFamily, Mode=TwoWay}"/>
+                     ItemsSource="{Binding Fonts, Mode=OneWay}"
+                     SelectedItem="{Binding MonospaceFontFamily, Mode=TwoWay}"/>
 
             <TextBlock Grid.Row="3" Grid.Column="0"
                        Text="{DynamicResource Text.Preferences.Appearance.FontSize}"