diff --git a/NTDLS.Katzebase.Management/Controls/CodeEditorTabPage.cs b/NTDLS.Katzebase.Management/Controls/CodeEditorTabPage.cs
index 1625ef11..b1a59de0 100644
--- a/NTDLS.Katzebase.Management/Controls/CodeEditorTabPage.cs
+++ b/NTDLS.Katzebase.Management/Controls/CodeEditorTabPage.cs
@@ -92,7 +92,7 @@ public string FilePath
         public RichTextBox OutputTextbox { get; private set; } = new()
         {
             Dock = DockStyle.Fill,
-            Font = new Font("Cascadia Mono", 10, FontStyle.Regular),
+            Font = new Font("Cascadia Code SemiLight", 10, FontStyle.Regular),
             WordWrap = false,
         };
 
diff --git a/NTDLS.Katzebase.Management/FormSettings.cs b/NTDLS.Katzebase.Management/FormSettings.cs
index e209feba..cd5f3423 100644
--- a/NTDLS.Katzebase.Management/FormSettings.cs
+++ b/NTDLS.Katzebase.Management/FormSettings.cs
@@ -105,7 +105,8 @@ private void ButtonSave_Click(object sender, EventArgs e)
                     QueryMaximumRows = textBoxMaximumRows.GetAndValidateNumeric(-1, int.MaxValue, "Maximum rows must be between [min] (no maximum) and [max]."),
                     EditorFontSize = (double)numericUpDownFontSize.Value,
                     EditorShowLineNumbers = checkBoxLineNumbers.Checked,
-                    EditorWordWrap = checkBoxWordWrap.Checked
+                    EditorWordWrap = checkBoxWordWrap.Checked,
+                    EditorFontFamily = comboBoxFont.Text
                 };
 
                 LocalUserApplicationData.SaveToDisk($"{Api.KbConstants.FriendlyName}\\Management", settings);
diff --git a/NTDLS.Katzebase.Management/FormStudio.cs b/NTDLS.Katzebase.Management/FormStudio.cs
index cd8e9ccc..4973cab7 100644
--- a/NTDLS.Katzebase.Management/FormStudio.cs
+++ b/NTDLS.Katzebase.Management/FormStudio.cs
@@ -979,7 +979,7 @@ private void SettingsToolStripMenuItem_Click(object sender, EventArgs e)
             {
                 foreach (var tabFilePage in tabControlBody.TabPages.OfType<CodeEditorTabPage>())
                 {
-                    //CodeTabPage.ApplyEditorSettings(tabFilePage.Editor);
+                    FullyFeaturedCodeEditor.ApplyEditorSettings(tabFilePage.Editor);
                 }
             }
         }
diff --git a/NTDLS.Katzebase.Management/ManagementSettings.cs b/NTDLS.Katzebase.Management/ManagementSettings.cs
index 0a82f729..d7e00770 100644
--- a/NTDLS.Katzebase.Management/ManagementSettings.cs
+++ b/NTDLS.Katzebase.Management/ManagementSettings.cs
@@ -9,6 +9,6 @@ internal class ManagementSettings
         public bool EditorShowLineNumbers { get; set; } = true;
         public bool EditorWordWrap { get; set; } = false;
         public double EditorFontSize { get; set; } = 12.5;
-        public string EditorFontFamily { get; set; } = "Cascadia Mono";
+        public string EditorFontFamily { get; set; } = "Cascadia Code SemiLight";
     }
 }