diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java
index 558105f9..db6ca0f5 100644
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java
@@ -154,6 +154,9 @@ class FlatThemeEditorPane
 
 		// error strip
 		errorStrip.setCaretMarkerColor( UIManager.getColor( "FlatThemeEditorPane.errorstrip.caretMarkerColor" ) );
+
+		if( preview != null )
+			preview.updateLater();
 	}
 
 	void updateFontSize( int sizeIncr ) {
@@ -271,7 +274,7 @@ class FlatThemeEditorPane
 			preview = new FlatThemePreview( textArea );
 			previewScrollPane = new JScrollPane( preview );
 			previewScrollPane.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
-			previewScrollPane.setBorder( null );
+			previewScrollPane.setBorder( BorderFactory.createEmptyBorder() );
 			previewScrollPane.getVerticalScrollBar().setUnitIncrement( 20 );
 			previewScrollPane.getHorizontalScrollBar().setUnitIncrement( 20 );
 			add( previewScrollPane, BorderLayout.LINE_END );
diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreview.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreview.java
index c39792f3..53e2b1db 100644
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreview.java
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreview.java
@@ -67,7 +67,7 @@ class FlatThemePreview
 		// update when showing preview (e.g. activating tab)
 		addHierarchyListener( e -> {
 			if( (e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) != 0 && isShowing() )
-				EventQueue.invokeLater( this::update );
+				updateLater();
 		} );
 	}
 
@@ -85,6 +85,10 @@ class FlatThemePreview
 	public void changedUpdate( DocumentEvent e ) {
 	}
 
+	void updateLater() {
+		EventQueue.invokeLater( this::update );
+	}
+
 	private void update() {
 		if( !isShowing() )
 			return;