diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
index bfffee7727..3bcb1faa18 100644
--- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
+++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
@@ -215,11 +215,14 @@ class UnitActions {
         }
 
         if (unit.name == "Great Engineer" && !unit.isEmbarked()) {
+            val canHurryWonder = if(unit.currentMovement==0f || !tile.isCityCenter()) false
+            else {
+                val currentConstruction = tile.getCity()!!.cityConstructions.getCurrentConstruction()
+                if(currentConstruction !is Building) false
+                else currentConstruction.isWonder || currentConstruction.isNationalWonder
+            }
             actionList += UnitAction("Hurry Wonder",
-                    unit.currentMovement >0 &&
-                            tile.isCityCenter() &&
-                            tile.getCity()!!.cityConstructions.getCurrentConstruction() is Building &&
-                            (tile.getCity()!!.cityConstructions.getCurrentConstruction() as Building).isWonder
+                    canHurryWonder
             ) {
                 tile.getCity()!!.cityConstructions.apply {
                     addProductionPoints(300 + 30 * tile.getCity()!!.population.population) //http://civilization.wikia.com/wiki/Great_engineer_(Civ5)