2 files changed, 6 insertions, 0 deletions

diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java
index 4f1b6e6..45f87bb 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java
@@ -52,6 +52,10 @@ public class EnigmaSyntaxKit extends JavaSyntaxKit {
         configuration.put("RightMarginColumn", "999"); //No need to have a right margin, if someone wants it add a config
 
         configuration.put("Action.quick-find", "cuchaz.enigma.gui.QuickFindAction, menu F");
+
+        if (Config.getInstance().editorFont != null) {
+            configuration.put("DefaultFont", Config.getInstance().editorFont);
+        }
     }
 
     /**
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Config.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Config.java
index 373dcf0..a389196 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Config.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Config.java
@@ -166,6 +166,8 @@ public class Config {
         public AlphaColorEntry deobfuscatedColor;
         public AlphaColorEntry deobfuscatedColorOutline;
 
+        public String editorFont;
+
         public Integer editorBackground;
         public Integer highlightColor;
         public Integer caretColor;