diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AutoWrappingJTextPane.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AutoWrappingJTextPane.java
index 4ae8b6f771..94b3cc68ad 100755
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AutoWrappingJTextPane.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AutoWrappingJTextPane.java
@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.corecomponents;
 
+import java.text.MessageFormat;
 import javax.swing.JTextPane;
 import javax.swing.SizeRequirements;
 import javax.swing.text.Element;
@@ -27,6 +28,7 @@ import javax.swing.text.ViewFactory;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.InlineView;
 import javax.swing.text.html.ParagraphView;
+import javax.swing.text.html.StyleSheet;
 import org.sleuthkit.autopsy.contentviewers.layout.ContentViewerDefaults;
 import org.sleuthkit.autopsy.coreutils.EscapeUtil;
 
@@ -106,6 +108,6 @@ public class AutoWrappingJTextPane extends JTextPane {
         String style = String.format("font-family: %s; font-size: %dpt; margin: 0px; padding: 0px 0px %dpx 0px;",
                     ContentViewerDefaults.getFont().getFamily(), ContentViewerDefaults.getFont().getSize(), ContentViewerDefaults.getLineSpacing());
         
-        super.setText("<pre style=\"" + style + "\">" + EscapeUtil.escapeHtml(text) + "</pre>");
+        super.setText(MessageFormat.format("<pre style=\"{0}\">{1}</pre>", style, EscapeUtil.escapeHtml(text)));
     }
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java
index 8ff9c0fdcc..5d6d7689f2 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java
@@ -29,10 +29,10 @@ import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
-import javax.swing.JLabel;
 import javax.swing.SizeRequirements;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
+import javax.swing.UIManager;
 import javax.swing.text.Element;
 import javax.swing.text.View;
 import javax.swing.text.ViewFactory;
@@ -59,7 +59,7 @@ class ExtractedContentPanel extends javax.swing.JPanel implements ResizableTextP
     private static final Logger logger = Logger.getLogger(ExtractedContentPanel.class.getName());
     
     // set font as close as possible to default
-    private static final Font DEFAULT_FONT = new JLabel().getFont();
+    private static final Font DEFAULT_FONT = UIManager.getDefaults().getFont("Label.font");
     
     private static final long serialVersionUID = 1L;
     private String contentName;
@@ -135,8 +135,9 @@ class ExtractedContentPanel extends javax.swing.JPanel implements ResizableTextP
                 };
             }
         };
-        // get the style sheet for editing font size
+        // set new style sheet to clear default styles
         styleSheet = editorKit.getStyleSheet();
+        setStyleSheetSize(styleSheet, DEFAULT_FONT.getSize());
         
         sourceComboBox.addItemListener(itemEvent -> {
             if (itemEvent.getStateChange() == ItemEvent.SELECTED) {
@@ -144,6 +145,7 @@ class ExtractedContentPanel extends javax.swing.JPanel implements ResizableTextP
             }
         });
         extractedTextPane.setComponentPopupMenu(rightClickMenu);
+        
         copyMenuItem.addActionListener(actionEvent -> extractedTextPane.copy());
         selectAllMenuItem.addActionListener(actionEvent -> extractedTextPane.selectAll());
         
@@ -160,7 +162,7 @@ class ExtractedContentPanel extends javax.swing.JPanel implements ResizableTextP
     
     
     private void setStyleSheetSize(StyleSheet styleSheet, int size) {
-        styleSheet.addRule("body {font-family:\"" + DEFAULT_FONT.getFamily() + "\"; font-size:" + size + "pt; } ");
+        styleSheet.addRule("body { font-family:\"" + DEFAULT_FONT.getFamily() + "\"; font-size:" + size + "pt; } ");
     }