diff --git a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActions.kt
index 2443b62815..342fb6ee1f 100644
--- a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActions.kt
+++ b/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActions.kt
@@ -376,7 +376,7 @@ object UnitActions {
         actionList += UnitAction(UnitActionType.ConstructImprovement,
             isCurrentAction = unit.currentTile.hasImprovementInProgress(),
             action = {
-                worldScreen.game.pushScreen(ImprovementPickerScreen(tile, unit) { worldScreen.switchToNextUnit() })
+                worldScreen.game.pushScreen(ImprovementPickerScreen(tile, unit) { if (UncivGame.Current.settings.autoUnitCycle) worldScreen.switchToNextUnit() })
             }.takeIf { couldConstruct }
         )
     }