diff --git a/Input/Keyboard/carrier-bindings.xml b/Input/Keyboard/carrier-bindings.xml
index a0eac4ba2..ac3f9faf4 100644
--- a/Input/Keyboard/carrier-bindings.xml
+++ b/Input/Keyboard/carrier-bindings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<PropertyList> 
+<PropertyList>
  <!-- map keys for catapult launch -->
- <key n="67"> 
+ <key n="67">
    <name>C</name>
    <desc>Catapult Launch Command.</desc>
    <binding>
@@ -17,8 +17,9 @@
      </binding>
    </mod-up>
  </key>
+
  <!-- map keys for launch-bar -->
- <key n="76"> 
+ <key n="76">
    <name>L</name>
    <desc>Launch-bar engage.</desc>
    <binding>
@@ -34,42 +35,56 @@
      </binding>
    </mod-up>
  </key>
+
  <!-- map keys for arrester hook -->
- <key n="79"> 
+ <key n="79">
    <name>O</name>
    <desc>Hook down.</desc>
-   <binding> 
+   <binding>
      <command>property-assign</command>
      <property>controls/gear/tailhook</property>
      <value type="double">1.0</value>
    </binding>
  </key>
- <key n="111"> 
+
+ <key n="111">
    <name>o</name>
    <desc>Hook Up.</desc>
-   <binding> 
+   <binding>
      <command>property-assign</command>
      <property>controls/gear/tailhook</property>
      <value type="double">0.0</value>
    </binding>
  </key>
+
  <!-- map keys for wing fold -->
- <key n="70"> 
+ <key n="70">
    <name>F</name>
    <desc>Wing Fold Down.</desc>
-   <binding> 
-     <command>property-assign</command>
-     <property>controls/flight/wing-fold</property>
-     <value type="double">1.0</value>
+   <binding>
+     <command>nasal</command>
+     <script>controls.wingsDown(1)</script>
    </binding>
+   <mod-up>
+     <binding>
+       <command>nasal</command>
+       <script>controls.wingsDown(0)</script>
+     </binding>
+   </mod-up>
  </key>
- <key n="102"> 
+
+ <key n="102">
    <name>f</name>
    <desc>Wing Fold Up.</desc>
-   <binding> 
-     <command>property-assign</command>
-     <property>controls/flight/wing-fold</property>
-     <value type="double">0.0</value>
-    </binding>
+   <binding>
+     <command>nasal</command>
+     <script>controls.wingsDown(-1)</script>
+   </binding>
+   <mod-up>
+     <binding>
+       <command>nasal</command>
+       <script>controls.wingsDown(0)</script>
+     </binding>
+   </mod-up>
  </key>
 </PropertyList>
diff --git a/Nasal/controls.nas b/Nasal/controls.nas
index 06e454fd3..f9b7d02e0 100644
--- a/Nasal/controls.nas
+++ b/Nasal/controls.nas
@@ -98,6 +98,10 @@ var wingSweep = func(step) {
     setprop("/controls/flight/wing-sweep", val > 1 ? 1 : val < 0 ? 0 : val);
 }
 
+var wingsDown = func(v) {
+    if(v) setprop("/controls/flight/wing-fold", v > 0);
+}
+
 var stepSpoilers = func(step) {
     if(props.globals.getNode("/sim/spoilers") != nil) {
         stepProps("/controls/flight/spoilers", "/sim/spoilers", step);