diff --git a/gui/dialogs/air.xml b/gui/dialogs/air.xml
index 40b6c713e..cf1fada9a 100644
--- a/gui/dialogs/air.xml
+++ b/gui/dialogs/air.xml
@@ -99,7 +99,7 @@
    <y>0</y>
    <legend>Cancel</legend>
    <equal>true</equal>
-   <keynum>27</keynum>
+   <key>Esc</key>
    <binding>
     <command>dialog-close</command>
    </binding>
diff --git a/gui/dialogs/aircraft.xml b/gui/dialogs/aircraft.xml
index 2ed2c510a..5de6091f9 100644
--- a/gui/dialogs/aircraft.xml
+++ b/gui/dialogs/aircraft.xml
@@ -44,7 +44,7 @@
   <y>10</y>
   <legend>Cancel</legend>
   <equal>true</equal>
-  <keynum>27</keynum>
+  <key>Esc</key>
   <binding>
    <command>dialog-close</command>
   </binding>
diff --git a/gui/dialogs/airports.xml b/gui/dialogs/airports.xml
index 77b54678e..0f6c7bb72 100644
--- a/gui/dialogs/airports.xml
+++ b/gui/dialogs/airports.xml
@@ -54,7 +54,7 @@
     <button>
       <legend>Close</legend>
       <equal>true</equal>
-      <keynum>27</keynum>
+      <key>Esc</key>
       <binding>
 	<command>dialog-close</command>
       </binding>
diff --git a/gui/dialogs/atc-ai.xml b/gui/dialogs/atc-ai.xml
index 2fd78a5de..87a7302a2 100755
--- a/gui/dialogs/atc-ai.xml
+++ b/gui/dialogs/atc-ai.xml
@@ -125,7 +125,7 @@
   <button>
    <legend>Cancel</legend>
    <equal>true</equal>
-   <keynum>27</keynum>
+   <key>Esc</key>
    <binding>
     <command>dialog-close</command>
    </binding>
diff --git a/gui/dialogs/atc-dialog.xml b/gui/dialogs/atc-dialog.xml
index 4410c818c..9f8723973 100644
--- a/gui/dialogs/atc-dialog.xml
+++ b/gui/dialogs/atc-dialog.xml
@@ -36,7 +36,7 @@
 
 	<button>
 		<legend>Cancel</legend>
-		<keynum>27</keynum>
+		<key>Esc</key>
 		<binding>
 			<command>dialog-close</command>
 		</binding>
diff --git a/gui/dialogs/atc-freq-display.xml b/gui/dialogs/atc-freq-display.xml
index e548b6af7..01337cfd9 100644
--- a/gui/dialogs/atc-freq-display.xml
+++ b/gui/dialogs/atc-freq-display.xml
@@ -34,7 +34,7 @@
 	<button>
 		<legend>Close</legend>
 		<default>true</default>
-		<keynum>27</keynum>
+		<key>Esc</key>
 		<binding>
 			<command>dialog-close</command>
 		</binding>
diff --git a/gui/dialogs/atc-freq-search.xml b/gui/dialogs/atc-freq-search.xml
index 98d26b54a..c8a487e87 100644
--- a/gui/dialogs/atc-freq-search.xml
+++ b/gui/dialogs/atc-freq-search.xml
@@ -68,7 +68,7 @@
 		<button>
 			<legend>Cancel</legend>
 			<equal>true</equal>
-			<keynum>27</keynum>
+			<key>Esc</key>
 			<binding>
 				<command>dialog-close</command>
 			</binding>
diff --git a/gui/dialogs/autopilot.xml b/gui/dialogs/autopilot.xml
index b4f406346..83ac509ef 100644
--- a/gui/dialogs/autopilot.xml
+++ b/gui/dialogs/autopilot.xml
@@ -301,7 +301,7 @@
   <button>
     <legend>OK</legend>
     <default>true</default>
-    <keynum>27</keynum>
+    <key>Esc</key>
     <padding>10</padding>
     <binding>
       <command>dialog-apply</command>
diff --git a/gui/dialogs/clouds.xml b/gui/dialogs/clouds.xml
index 7a01288fa..7d280f4b9 100644
--- a/gui/dialogs/clouds.xml
+++ b/gui/dialogs/clouds.xml
@@ -304,7 +304,7 @@
    <y>0</y>
    <legend>Cancel</legend>
    <equal>true</equal>
-   <keynum>27</keynum>
+   <key>Esc</key>
    <binding>
     <command>dialog-close</command>
    </binding>
diff --git a/gui/dialogs/exit.xml b/gui/dialogs/exit.xml
index ef188b13d..f194958a1 100644
--- a/gui/dialogs/exit.xml
+++ b/gui/dialogs/exit.xml
@@ -31,7 +31,7 @@
     <button>
       <legend>Cancel</legend>
       <equal>true</equal>
-      <keynum>27</keynum>
+      <key>Esc</key>
       <binding>
 	<command>dialog-close</command>
       </binding>
diff --git a/gui/dialogs/gps.xml b/gui/dialogs/gps.xml
index 8170670d5..a12d7a7c3 100644
--- a/gui/dialogs/gps.xml
+++ b/gui/dialogs/gps.xml
@@ -313,7 +313,7 @@
   <y>10</y>
   <legend>Close</legend>
   <default>true</default>
-  <keynum>27</keynum>
+  <key>Esc</key>
   <binding>
    <command>dialog-close</command>
   </binding>
diff --git a/gui/dialogs/instrument-failures.xml b/gui/dialogs/instrument-failures.xml
index fef822c0d..a0214dc31 100644
--- a/gui/dialogs/instrument-failures.xml
+++ b/gui/dialogs/instrument-failures.xml
@@ -163,7 +163,7 @@
    <y>0</y>
    <legend>Cancel</legend>
    <equal>true</equal>
-   <keynum>27</keynum>
+   <key>Esc</key>
    <binding>
     <command>dialog-close</command>
    </binding>
diff --git a/gui/dialogs/instruments.xml b/gui/dialogs/instruments.xml
index e7f376691..cfeda905a 100644
--- a/gui/dialogs/instruments.xml
+++ b/gui/dialogs/instruments.xml
@@ -200,7 +200,7 @@
    <y>10</y>
    <legend>Close</legend>
    <default>true</default>
-   <keynum>27</keynum>
+   <key>Esc</key>
    <binding>
     <command>dialog-close</command>
    </binding>
diff --git a/gui/dialogs/load_flight.xml b/gui/dialogs/load_flight.xml
index 8f65dbbad..135eb1927 100644
--- a/gui/dialogs/load_flight.xml
+++ b/gui/dialogs/load_flight.xml
@@ -35,7 +35,7 @@
    <button>
      <legend>Cancel</legend>
      <equal>true</equal>
-     <keynum>27</keynum>
+     <key>Esc</key>
      <binding><command>dialog-close</command></binding>
    </button>
    <empty><stretch>true</stretch></empty>
diff --git a/gui/dialogs/location-in-air.xml b/gui/dialogs/location-in-air.xml
index 2744f84ba..c3c582434 100644
--- a/gui/dialogs/location-in-air.xml
+++ b/gui/dialogs/location-in-air.xml
@@ -134,7 +134,7 @@
     <button>
       <legend>Cancel</legend>
       <equal>true</equal>
-      <keynum>27</keynum>
+      <key>Esc</key>
       <binding>
 	<command>dialog-close</command>
       </binding>
diff --git a/gui/dialogs/location-of-tower.xml b/gui/dialogs/location-of-tower.xml
index 631cb18ad..58f618914 100644
--- a/gui/dialogs/location-of-tower.xml
+++ b/gui/dialogs/location-of-tower.xml
@@ -140,7 +140,7 @@
     <button>
       <legend>Cancel</legend>
       <equal>true</equal>
-      <keynum>27</keynum>
+      <key>Esc</key>
       <binding>
 	<command>dialog-close</command>
       </binding>
diff --git a/gui/dialogs/location-on-ground.xml b/gui/dialogs/location-on-ground.xml
index ec4b28ad4..63feaea8b 100644
--- a/gui/dialogs/location-on-ground.xml
+++ b/gui/dialogs/location-on-ground.xml
@@ -66,7 +66,7 @@
     <button>
       <legend>Cancel</legend>
       <equal>true</equal> 
-      <keynum>27</keynum>
+      <key>Esc</key>
       <binding>
 	<command>dialog-close</command>
       </binding>
diff --git a/gui/dialogs/logging.xml b/gui/dialogs/logging.xml
index d99b3a715..d4644f57a 100644
--- a/gui/dialogs/logging.xml
+++ b/gui/dialogs/logging.xml
@@ -228,7 +228,7 @@
    <button>
      <legend>Cancel</legend>
      <equal>true</equal>
-     <keynum>27</keynum>
+     <key>Esc</key>
      <binding><command>dialog-close</command></binding>
    </button>
    <empty><stretch>true</stretch></empty>
diff --git a/gui/dialogs/message.xml b/gui/dialogs/message.xml
index d27ec66a7..e508d8bc7 100644
--- a/gui/dialogs/message.xml
+++ b/gui/dialogs/message.xml
@@ -17,7 +17,7 @@ message and others.
 	<button>
 		<legend>BUTTONTEXT</legend>
 		<default>true</default>
-		<keynum>27</keynum>
+		<key>Esc</key>
 		<binding>
 			<command>dialog-close</command>
 		</binding>
diff --git a/gui/dialogs/pilot_offset.xml b/gui/dialogs/pilot_offset.xml
index 941b56cc4..e359b1692 100644
--- a/gui/dialogs/pilot_offset.xml
+++ b/gui/dialogs/pilot_offset.xml
@@ -78,7 +78,7 @@
      <legend>OK</legend>
      <equal>true</equal>
      <default>true</default>
-     <keynum>27</keynum>
+     <key>Esc</key>
      <binding><command>dialog-apply</command></binding>
      <binding><command>dialog-close</command></binding>
    </button>
diff --git a/gui/dialogs/radios.xml b/gui/dialogs/radios.xml
index 17cf67a93..bd8f95bc3 100644
--- a/gui/dialogs/radios.xml
+++ b/gui/dialogs/radios.xml
@@ -498,7 +498,7 @@
    <y>10</y>
    <legend>Cancel</legend>
    <equal>true</equal>
-   <keynum>27</keynum>
+   <key>Esc</key>
    <binding>
     <command>dialog-close</command>
    </binding>
diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index 501689e9c..e72b250f3 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -256,7 +256,7 @@
     <button>
       <legend>Close</legend>
       <default>true</default>
-      <keynum>27</keynum>
+      <key>Esc</key>
       <binding>
         <command>dialog-apply</command>
       </binding>
diff --git a/gui/dialogs/replay.xml b/gui/dialogs/replay.xml
index 0a0248cfa..e79fbcbec 100644
--- a/gui/dialogs/replay.xml
+++ b/gui/dialogs/replay.xml
@@ -90,7 +90,7 @@
     <button>
       <legend>Cancel</legend>
       <equal>true</equal>
-      <keynum>27</keynum>
+      <key>Esc</key>
       <binding>
 	<command>dialog-close</command>
       </binding>
diff --git a/gui/dialogs/save_flight.xml b/gui/dialogs/save_flight.xml
index 13b0ce3bd..0dd5dab9b 100644
--- a/gui/dialogs/save_flight.xml
+++ b/gui/dialogs/save_flight.xml
@@ -35,7 +35,7 @@
    <button>
      <legend>Cancel</legend>
      <equal>true</equal>
-     <keynum>27</keynum>
+     <key>Esc</key>
      <binding><command>dialog-close</command></binding>
    </button>
    <empty><stretch>true</stretch></empty>
diff --git a/gui/dialogs/sound.xml b/gui/dialogs/sound.xml
index 3cb3ba2f2..485f1904e 100644
--- a/gui/dialogs/sound.xml
+++ b/gui/dialogs/sound.xml
@@ -43,7 +43,7 @@
       <legend>OK</legend>
       <default>true</default>
       <equal>true</equal>
-      <keynum>27</keynum>
+      <key>Esc</key>
       <binding>
         <command>dialog-apply</command>
       </binding>
diff --git a/gui/dialogs/static-lod.xml b/gui/dialogs/static-lod.xml
index d61d25bef..5e683138b 100755
--- a/gui/dialogs/static-lod.xml
+++ b/gui/dialogs/static-lod.xml
@@ -97,7 +97,7 @@
     <empty><stretch>true</stretch></empty>
     <button>
       <legend>Cancel</legend>
-      <keynum>27</keynum>
+      <key>Esc</key>
       <binding>
 	<command>dialog-close</command>
       </binding>
diff --git a/gui/dialogs/system-failures.xml b/gui/dialogs/system-failures.xml
index 1a841eb22..142b22f9a 100644
--- a/gui/dialogs/system-failures.xml
+++ b/gui/dialogs/system-failures.xml
@@ -99,7 +99,7 @@
    <y>0</y>
    <legend>Cancel</legend>
    <equal>true</equal>
-   <keynum>27</keynum>
+   <key>Esc</key>
    <binding>
     <command>dialog-close</command>
    </binding>
diff --git a/gui/dialogs/timeofday.xml b/gui/dialogs/timeofday.xml
index b924723af..36c361bf7 100644
--- a/gui/dialogs/timeofday.xml
+++ b/gui/dialogs/timeofday.xml
@@ -101,7 +101,7 @@
    <y>10</y>
    <legend>Dismiss</legend>
    <default>true</default>
-   <keynum>27</keynum>
+   <key>Esc</key>
    <binding>
     <command>dialog-close</command>
    </binding>
diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml
index 5d02787d3..ba542da2a 100644
--- a/gui/dialogs/weather.xml
+++ b/gui/dialogs/weather.xml
@@ -834,7 +834,7 @@
    <y>0</y>
    <legend>Cancel</legend>
    <equal>true</equal>
-   <keynum>27</keynum>
+   <key>Esc</key>
    <binding>
     <command>dialog-close</command>
    </binding>
diff --git a/gui/dialogs/weather_scenario.xml b/gui/dialogs/weather_scenario.xml
index ad2bc01e3..fd057aeba 100644
--- a/gui/dialogs/weather_scenario.xml
+++ b/gui/dialogs/weather_scenario.xml
@@ -62,7 +62,7 @@
     <button>
       <legend>Close</legend>
       <default>true</default>
-      <keynum>27</keynum>
+      <key>Esc</key>
       <binding>
         <command>dialog-apply</command>
       </binding>
diff --git a/gui/dialogs/winds.xml b/gui/dialogs/winds.xml
index 062095e04..f7a5f6832 100644
--- a/gui/dialogs/winds.xml
+++ b/gui/dialogs/winds.xml
@@ -90,7 +90,7 @@
   <y>10</y>
   <legend>Cancel</legend>
   <equal>true</equal>
-  <keynum>27</keynum>
+  <key>Esc</key>
   <binding>
    <command>dialog-close</command>
   </binding>