diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e6df84d..7483f075 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ FlatLaf Change Log
 - OptionPane: Fixed rendering of longer HTML text. (issue #12)
 - EditorPane and TextPane: Fixed font and text color when using HTML content.
   (issue #9)
+- ComboBox: Fixed `StackOverflowError` when switching LaF. (issue #14)
 - SwingX: Support `JXBusyLabel`, `JXDatePicker`, `JXHeader`, `JXHyperlink`,
   `JXMonthView`, `JXTaskPaneContainer` and `JXTaskPane`. (issue #8)
 
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
index badf24be..6fd278b5 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
@@ -368,9 +368,9 @@ public class FlatComboBoxUI
 	@SuppressWarnings( { "rawtypes", "unchecked" } )
 	private class FlatComboPopup
 		extends BasicComboPopup
-		implements ListCellRenderer
 	{
 		private CellPaddingBorder paddingBorder;
+		private final ListCellRenderer renderer = new PopupListCellRenderer();
 
 		FlatComboPopup( JComboBox combo ) {
 			super( combo );
@@ -405,7 +405,7 @@ public class FlatComboBoxUI
 		protected void configureList() {
 			super.configureList();
 
-			list.setCellRenderer( this );
+			list.setCellRenderer( renderer );
 		}
 
 		@Override
@@ -416,27 +416,33 @@ public class FlatComboBoxUI
 					super.propertyChange( e );
 
 					if( e.getPropertyName() == "renderer" )
-						list.setCellRenderer( FlatComboPopup.this );
+						list.setCellRenderer( renderer );
 				}
 			};
 		}
 
-		@Override
-		public Component getListCellRendererComponent( JList list, Object value,
-			int index, boolean isSelected, boolean cellHasFocus )
+		//---- class PopupListCellRenderer -----
+
+		private class PopupListCellRenderer
+			implements ListCellRenderer
 		{
-			ListCellRenderer renderer = comboBox.getRenderer();
-			CellPaddingBorder.uninstall( renderer );
+			@Override
+			public Component getListCellRendererComponent( JList list, Object value,
+				int index, boolean isSelected, boolean cellHasFocus )
+			{
+				ListCellRenderer renderer = comboBox.getRenderer();
+				CellPaddingBorder.uninstall( renderer );
 
-			Component c = renderer.getListCellRendererComponent( list, value, index, isSelected, cellHasFocus );
+				Component c = renderer.getListCellRendererComponent( list, value, index, isSelected, cellHasFocus );
 
-			if( c instanceof JComponent ) {
-				if( paddingBorder == null )
-					paddingBorder = new CellPaddingBorder( padding );
-				paddingBorder.install( (JComponent) c );
+				if( c instanceof JComponent ) {
+					if( paddingBorder == null )
+						paddingBorder = new CellPaddingBorder( padding );
+					paddingBorder.install( (JComponent) c );
+				}
+
+				return c;
 			}
-
-			return c;
 		}
 	}