diff --git a/freeciv-web/src/main/webapp/javascript/action_dialog.js b/freeciv-web/src/main/webapp/javascript/action_dialog.js
index 39a88ed99..67af62d2f 100644
--- a/freeciv-web/src/main/webapp/javascript/action_dialog.js
+++ b/freeciv-web/src/main/webapp/javascript/action_dialog.js
@@ -229,6 +229,13 @@ function popup_action_selection(actor_unit, action_probabilities,
                                    action_probabilities)
              + "'>";
   }
+  if (action_probabilities[ACTION_JOIN_CITY] != 0) {
+    dhtml += "<input id='act_sel_join_city" + actor_unit['id']
+             + "' class='act_sel_button' type='button' value='"
+             + format_action_label(ACTION_JOIN_CITY,
+                                   action_probabilities)
+             + "'>";
+  }
   if (action_probabilities[ACTION_SPY_BRIBE_UNIT] != 0) {
     dhtml += "<input id='act_sel_bribe" + actor_unit['id']
         + "' class='act_sel_button' type='button' value='"
@@ -421,6 +428,20 @@ function popup_action_selection(actor_unit, action_probabilities,
     });
   }
 
+  if (action_probabilities[ACTION_JOIN_CITY] != 0) {
+    $("#act_sel_join_city" + actor_unit['id']).click(function() {
+      var packet = {"pid"         : packet_unit_do_action,
+                    "actor_id"    : actor_unit['id'],
+                    "target_id"   : target_city['id'],
+                    "value"       : 0,
+                    "name"        : "",
+                    "action_type" : ACTION_JOIN_CITY};
+      send_request(JSON.stringify(packet));
+
+      $(id).remove();
+    });
+  }
+
   if (action_probabilities[ACTION_SPY_BRIBE_UNIT] != 0) {
     $("#act_sel_bribe" + actor_unit['id']).click(function() {
       var packet = {"pid" : packet_unit_action_query,