diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp
index 8f049a29..4278180b 100644
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
@@ -18,6 +18,7 @@
 #include <QApplication>
 #include <QComboBox>
 #include <QFileDialog>
+#include <QFontComboBox>
 #include <QFormLayout>
 #include <QInputDialog>
 #include <QLabel>
@@ -470,7 +471,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
         useStunServer_             = new Toggle{this};
         scaleFactorCombo_          = new QComboBox{this};
         fontSizeCombo_             = new QComboBox{this};
-        fontSelectionCombo_        = new QComboBox{this};
+        fontSelectionCombo_        = new QFontComboBox{this};
         emojiFontSelectionCombo_   = new QComboBox{this};
         timelineMaxWidthSpin_      = new QSpinBox{this};
 
@@ -490,10 +491,6 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
                 fontSizeCombo_->addItem(QString("%1 ").arg(QString::number(option)));
 
         QFontDatabase fontDb;
-        auto fontFamilies = fontDb.families();
-        for (const auto &family : fontFamilies) {
-                fontSelectionCombo_->addItem(family);
-        }
 
         // TODO: Is there a way to limit to just emojis, rather than
         // all emoji fonts?
diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h
index e4a34893..37355602 100644
--- a/src/UserSettingsPage.h
+++ b/src/UserSettingsPage.h
@@ -27,6 +27,7 @@ class Toggle;
 class QLabel;
 class QFormLayout;
 class QComboBox;
+class QFontComboBox;
 class QSpinBox;
 class QHBoxLayout;
 class QVBoxLayout;
@@ -261,7 +262,7 @@ private:
         QComboBox *themeCombo_;
         QComboBox *scaleFactorCombo_;
         QComboBox *fontSizeCombo_;
-        QComboBox *fontSelectionCombo_;
+        QFontComboBox *fontSelectionCombo_;
         QComboBox *emojiFontSelectionCombo_;
 
         QSpinBox *timelineMaxWidthSpin_;