diff --git a/core/src/com/unciv/ui/components/extensions/Scene2dExtensions.kt b/core/src/com/unciv/ui/components/extensions/Scene2dExtensions.kt
index a952697268..7856e623d7 100644
--- a/core/src/com/unciv/ui/components/extensions/Scene2dExtensions.kt
+++ b/core/src/com/unciv/ui/components/extensions/Scene2dExtensions.kt
@@ -43,6 +43,7 @@ private class RestorableTextButtonStyle(
 /** Disable a [Button] by setting its [touchable][Button.touchable] and [style][Button.style] properties. */
 fun Button.disable() {
     touchable = Touchable.disabled
+    isDisabled = true
     val oldStyle = style
     if (oldStyle is RestorableTextButtonStyle) return
     val disabledStyle = BaseScreen.skin.get("disabled", TextButtonStyle::class.java)
@@ -54,6 +55,7 @@ fun Button.enable() {
     if (oldStyle is RestorableTextButtonStyle) {
         style = oldStyle.restoreStyle
     }
+    isDisabled = false
     touchable = Touchable.enabled
 }
 /** Enable or disable a [Button] by setting its [touchable][Button.touchable] and [style][Button.style] properties,
diff --git a/core/src/com/unciv/ui/components/input/ActivationActionMap.kt b/core/src/com/unciv/ui/components/input/ActivationActionMap.kt
index c10c0635ab..309187a271 100644
--- a/core/src/com/unciv/ui/components/input/ActivationActionMap.kt
+++ b/core/src/com/unciv/ui/components/input/ActivationActionMap.kt
@@ -51,7 +51,8 @@ internal class ActivationActionMap : MutableMap<ActivationTypes, ActivationActio
         if (actions.isEmpty()) return false
         if (actions.sound != UncivSound.Silent)
             Concurrency.runOnGLThread("Sound") { SoundPlayer.play(actions.sound) }
-        for (action in actions)
+        // We can't know an activation handler won't redefine activations, so better iterate over a copy
+        for (action in actions.toList())
             action.invoke()
         return true
     }
diff --git a/core/src/com/unciv/ui/components/input/ActorAttachments.kt b/core/src/com/unciv/ui/components/input/ActorAttachments.kt
index bcfc1543d8..f7eb1a1a6a 100644
--- a/core/src/com/unciv/ui/components/input/ActorAttachments.kt
+++ b/core/src/com/unciv/ui/components/input/ActorAttachments.kt
@@ -1,6 +1,7 @@
 package com.unciv.ui.components.input
 
 import com.badlogic.gdx.scenes.scene2d.Actor
+import com.badlogic.gdx.scenes.scene2d.utils.Disableable
 import com.unciv.models.UncivSound
 
 internal class ActorAttachments private constructor(actor: Actor) {
@@ -37,6 +38,7 @@ internal class ActorAttachments private constructor(actor: Actor) {
 
     fun activate(type: ActivationTypes): Boolean {
         if (!this::activationActions.isInitialized) return false
+        if ((actor as? Disableable)?.isDisabled == true) return false // Skip if disabled - could reach here through key shortcuts
         return activationActions.activate(type)
     }