diff --git a/diylc/diylc-swing/lib/swing-framework.jar b/diylc/diylc-swing/lib/swing-framework.jar
index 3cb27330..baaf7810 100644
Binary files a/diylc/diylc-swing/lib/swing-framework.jar and b/diylc/diylc-swing/lib/swing-framework.jar differ
diff --git a/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java b/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java
index cdc34297..379db03f 100644
--- a/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java
+++ b/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java
@@ -28,6 +28,7 @@ import java.util.Properties;
 
 import javax.swing.ImageIcon;
 import javax.swing.JOptionPane;
+import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
@@ -114,16 +115,19 @@ public class DIYLCStarter {
       LOG.error("Could not set Look&Feel", e);
     }
     
-//    Thread fontThread = new Thread(new Runnable() {
-//
-//      @Override
-//      public void run() {
-//        LOG.debug("Starting font pre-loading");
-//        FontChooserComboBox box = new FontChooserComboBox();
-//        LOG.debug("Finished font pre-loading");
-//      }
-//    });
-//    fontThread.start();
+    Thread fontThread = new Thread(new Runnable() {
+
+      @Override
+      public void run() {
+        LOG.debug("Starting font pre-loading");
+        FontChooserComboBox box = new FontChooserComboBox();
+        box.getPreferredSize();
+        JPanel p = new JPanel();
+        box.paint(p.getGraphics());
+        LOG.debug("Finished font pre-loading");
+      }
+    });
+    fontThread.start();
 
     String val = System.getProperty(SCRIPT_RUN);
     if (!"true".equals(val)) {
diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml
index 4fc1d44d..9030336a 100644
--- a/diylc/diylc-swing/update.xml
+++ b/diylc/diylc-swing/update.xml
@@ -2009,7 +2009,11 @@
 			</versionNumber>
 			<releaseDate>2018-12-21 00:00:00.000 CET</releaseDate>
 			<name></name>
-			<changes>								
+			<changes>	
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Changed the way fonts are initialized, hoping to reduce a chance of dialogs hanging</description>
+				</org.diylc.appframework.update.Change>								
 				<org.diylc.appframework.update.Change>
 					<changeType>BUG_FIX</changeType>
 					<description>Fixed selection issues on right click in OSX</description>