diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java
index 3fb72467..7740995b 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java
@@ -573,7 +573,7 @@ public class FlatTabbedPaneUI
 
 	//---- class FlatScrollableTabButton --------------------------------------
 
-	protected static class FlatScrollableTabButton
+	protected class FlatScrollableTabButton
 		extends FlatArrowButton
 		implements MouseListener
 	{
@@ -589,6 +589,15 @@ public class FlatTabbedPaneUI
 			addMouseListener( this );
 		}
 
+		@Override
+		public Dimension getPreferredSize() {
+			Dimension size = super.getPreferredSize();
+			if( direction == WEST || direction == EAST )
+				return new Dimension( size.width, Math.max( size.height, maxTabHeight ) );
+			else
+				return new Dimension( Math.max( size.width, maxTabWidth ), size.height );
+		}
+
 		@Override
 		public void mousePressed( MouseEvent e ) {
 			if( SwingUtilities.isLeftMouseButton( e ) && isEnabled() ) {