diff --git a/src/main/java/featurecat/lizzie/gui/BoardRenderer.java b/src/main/java/featurecat/lizzie/gui/BoardRenderer.java
index 76351c04d..46aa77b6c 100644
--- a/src/main/java/featurecat/lizzie/gui/BoardRenderer.java
+++ b/src/main/java/featurecat/lizzie/gui/BoardRenderer.java
@@ -152,7 +152,7 @@ public void draw(Graphics2D g) {
     //        timer.lap("rendering images");
 
     if (!isMainBoard) {
-      if (Lizzie.config.showBranchNow()) {
+      if (showingBranch) {
         drawMoveNumbers(g);
       }
       return;
@@ -676,14 +676,15 @@ private Optional<MoveData> getBestMove() {
 
   /** Render the shadows and stones in correct background-foreground order */
   private void renderImages(Graphics2D g) {
+    boolean showBranchNow = Lizzie.config.showBranchNow() || !isMainBoard;
     g.setRenderingHint(KEY_ANTIALIASING, VALUE_ANTIALIAS_OFF);
     g.drawImage(cachedEstimateLargeRectImage, x, y, null);
     g.drawImage(cachedStonesShadowImage, x, y, null);
-    if (Lizzie.config.showBranchNow()) {
+    if (showBranchNow) {
       g.drawImage(branchStonesShadowImage, x, y, null);
     }
     g.drawImage(cachedStonesImage, x, y, null);
-    if (Lizzie.config.showBranchNow()) {
+    if (showBranchNow) {
       g.drawImage(branchStonesImage, x, y, null);
     }
     g.drawImage(cachedEstimateSmallRectImage, x, y, null);