diff --git a/src/main/java/featurecat/lizzie/gui/ConfigDialog.java b/src/main/java/featurecat/lizzie/gui/ConfigDialog.java
index a0d50074e..8d3e8d762 100644
--- a/src/main/java/featurecat/lizzie/gui/ConfigDialog.java
+++ b/src/main/java/featurecat/lizzie/gui/ConfigDialog.java
@@ -1683,7 +1683,12 @@ protected void paintComponent(Graphics g) {
                 int squareLength = 30;
                 int stoneRadius = squareLength < 4 ? 1 : squareLength / 2 - 1;
                 int size = stoneRadius * 2 + 1;
-                double r = stoneRadius * Lizzie.config.shadowSize / 100;
+                double r =
+                    stoneRadius
+                        * (theme == null || cmbThemes.getSelectedIndex() <= 0
+                            ? Lizzie.config.shadowSize
+                            : theme.shadowSize())
+                        / 100;
                 int shadowSize = (int) (r * 0.3) == 0 ? 1 : (int) (r * 0.3);
                 int fartherShadowSize = (int) (r * 0.17) == 0 ? 1 : (int) (r * 0.17);
                 int stoneX = x + squareLength * 2;