Index: cityrep.c
===================================================================
--- cityrep.c	(revision 12062)
+++ cityrep.c	(working copy)
@@ -699,6 +699,11 @@
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
   create_last_menu(item);
 
+  item = gtk_menu_item_new_with_mnemonic(_("Ci_ty Governor"));
+  change_cma_item = item;
+  gtk_menu_shell_append(GTK_MENU_SHELL(menubar), change_cma_item);
+  append_cma_to_menu_item(GTK_MENU_ITEM(change_cma_item), TRUE);
+
   item = gtk_menu_item_new_with_mnemonic(_("_Select"));
   gtk_menu_shell_append(GTK_MENU_SHELL(menubar), item);
   create_select_menu(item);
@@ -1211,8 +1216,6 @@
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_improvements_item);
   change_wonders_item = gtk_menu_item_new_with_label(_("Wonders"));
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_wonders_item);
-  change_cma_item = gtk_menu_item_new_with_label(_("Citizen Governor"));
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_cma_item);
 }
 
 /****************************************************************
@@ -1295,7 +1298,6 @@
 				  FALSE, TRUE, CO_CHANGE,
 				  city_can_build_impr_or_unit,
 				  G_CALLBACK(select_impr_or_unit_callback), n);
-  append_cma_to_menu_item(GTK_MENU_ITEM(change_cma_item), TRUE);
 }
 
 /****************************************************************
@@ -1573,9 +1575,11 @@
     gtk_widget_set_sensitive(city_center_command, FALSE);
     gtk_widget_set_sensitive(city_popup_command, FALSE);
     gtk_widget_set_sensitive(city_buy_command, FALSE);
+    gtk_widget_set_sensitive(change_cma_item, FALSE);
   } else {
     gtk_widget_set_sensitive(city_production_command,
 			     can_client_issue_orders());
+    gtk_widget_set_sensitive(change_cma_item, can_client_issue_orders());
     gtk_widget_set_sensitive(city_center_command, TRUE);
     gtk_widget_set_sensitive(city_popup_command, TRUE);
     gtk_widget_set_sensitive(city_buy_command, can_client_issue_orders());