diff --git a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt
index 3e3b2d2ba3..4378b21652 100644
--- a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt
+++ b/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt
@@ -21,12 +21,13 @@ class ImprovementPickerScreen(val tileInfo: TileInfo, val onAccept: ()->Unit) :
     val currentPlayerCiv = game.gameInfo.getCurrentPlayerCivilization()
 
     fun accept(improvement: TileImprovement?) {
-        if (improvement == null || improvement.name == tileInfo.improvementInProgress) return
+        if (improvement == null) return
         if (improvement.name == Constants.cancelImprovementOrder) {
             tileInfo.stopWorkingOnImprovement()
             // no onAccept() - Worker can stay selected
         } else {
-            tileInfo.startWorkingOnImprovement(improvement, currentPlayerCiv)
+            if (improvement.name != tileInfo.improvementInProgress)
+                tileInfo.startWorkingOnImprovement(improvement, currentPlayerCiv)
             if (tileInfo.civilianUnit != null) tileInfo.civilianUnit!!.action = null // this is to "wake up" the worker if it's sleeping
             onAccept()
         }
diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt
index 84d6f159c7..9f05b96635 100644
--- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt
+++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt
@@ -99,7 +99,8 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() {
         diplomacyTable.defaults().pad(10f)
 
         val displayNameTable = Table()
-        displayNameTable.add(ImageGetter.getNationIndicator(otherCiv.nation, 24f)).pad(0f,0f,5f,10f)
+        displayNameTable.add(ImageGetter.getNationIndicator(otherCiv.nation, 24f))
+                .pad(0f,0f,5f,10f)
         displayNameTable.add(otherCiv.getLeaderDisplayName().toLabel(fontSize = 24))
         diplomacyTable.add(displayNameTable).row()