diff --git a/gui/dialogs/mcdu1-dlg.xml b/gui/dialogs/mcdu1-dlg.xml
index c998816f..e8d44a08 100644
--- a/gui/dialogs/mcdu1-dlg.xml
+++ b/gui/dialogs/mcdu1-dlg.xml
@@ -17,6 +17,18 @@
 			<halign>left</halign>
 			<label>Left MCDU</label>
 		</text>
+		<button>
+			<halign>right</halign>
+			<pref-width>220</pref-width>
+			<pref-height>20</pref-height>
+			<legend>Toggle Keyboard Input</legend>
+			<live>true</live>
+			<property>/FMGC/keyboard-left</property>
+			<binding>
+				<command>property-toggle</command>
+				<property>/FMGC/keyboard-left</property>
+			</binding>
+		</button>
 		<button>
 			<halign>right</halign>
 			<pref-width>20</pref-width>
@@ -24,8 +36,9 @@
 			<legend>X</legend>
 			<key>Esc</key>
 			<binding>
-				<command>nasal</command>
-				<script>setprop("FMGC/keyboard-left", 0);</script>
+				<command>property-assign</command>
+				<property>/FMGC/keyboard-left</property>
+				<value>0</value>
 			</binding>
 			<binding>
 				<command>dialog-close</command>
diff --git a/gui/dialogs/mcdu2-dlg.xml b/gui/dialogs/mcdu2-dlg.xml
index 6e82fd90..8903044d 100644
--- a/gui/dialogs/mcdu2-dlg.xml
+++ b/gui/dialogs/mcdu2-dlg.xml
@@ -17,6 +17,18 @@
 			<halign>left</halign>
 			<label>Right MCDU</label>
 		</text>
+		<button>
+			<halign>right</halign>
+			<pref-width>220</pref-width>
+			<pref-height>20</pref-height>
+			<legend>Toggle Keyboard Input</legend>
+			<live>true</live>
+			<property>/FMGC/keyboard-right</property>
+			<binding>
+				<command>property-toggle</command>
+				<property>/FMGC/keyboard-right</property>
+			</binding>
+		</button>
 		<button>
 			<halign>right</halign>
 			<pref-width>20</pref-width>
@@ -24,8 +36,9 @@
 			<legend>X</legend>
 			<key>Esc</key>
 			<binding>
-				<command>nasal</command>
-				<script>setprop("FMGC/keyboard-right", 0);</script>
+				<command>property-assign</command>
+				<property>/FMGC/keyboard-right</property>
+				<value>0</value>
 			</binding>
 			<binding>
 				<command>dialog-close</command>