diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 91c01316..a20c5876 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -374,6 +374,19 @@
 				<property>controls/fire/cargo/fwddisch</property>
 				<value>1</value>
 			</binding>
+			<binding>
+				<condition>
+					<and>
+						<equals>
+							<property>controls/OH/protectors/fwddisch</property>
+							<value>1</value>
+						</equals>
+					</and>
+				</condition>
+				<command>property-assign</command>
+				<property>controls/OH/protectors/fwddisch</property>
+				<value>0</value>
+			</binding>
 			<binding>
 				<condition>
 					<equals>
@@ -409,6 +422,19 @@
 				<property>controls/fire/cargo/aftdisch</property>
 				<value>1</value>
 			</binding>
+			<binding>
+				<condition>
+					<and>
+						<equals>
+							<property>controls/OH/protectors/aftdisch</property>
+							<value>1</value>
+						</equals>
+					</and>
+				</condition>
+				<command>property-assign</command>
+				<property>controls/OH/protectors/fwddisch</property>
+				<value>0</value>
+			</binding>
 			<binding>
 				<condition>
 					<equals>
@@ -426,23 +452,40 @@
 		<type>pick</type>
 		<object-name>FwdCargoDischGuard</object-name>
 		<action>
-			<button>1</button>
+			<button>0</button>
+			<repeatable>true</repeatable>
 			<binding>
+				<condition>
+					<property>devices/status/keyboard/shift</property>
+				</condition>
 				<command>property-assign</command>
 				<property>controls/OH/protectors/fwddisch</property>
 				<value>1</value>
 			</binding>
-			<mod-up>
-				<binding>
-					<command>property-assign</command>
-					<property>controls/OH/protectors/fwddisch</property>
-					<value>0</value>
-				</binding>
-				<binding>
-					<command>nasal</command>
-					<script>setprop("/sim/sounde/oh-cover", 1);</script>
-				</binding>
-			</mod-up>
+			<binding>
+				<condition>
+					<not>
+						<property>devices/status/keyboard/shift</property>
+					</not>
+				</condition>
+				<command>property-assign</command>
+				<property>controls/OH/protectors/fwddisch</property>
+				<value>0</value>
+			</binding>
+			<binding>
+				<condition>
+					<and>
+						<not>
+							<property>devices/status/keyboard/shift</property>
+						</not>
+						<not>
+							<property>controls/OH/protectors/fwddisch</property>
+						</not>
+					</and>
+				</condition>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/oh-cover", 1);</script>
+			</binding>
 		</action>
 	</animation>
 	
@@ -450,23 +493,40 @@
 		<type>pick</type>
 		<object-name>AftCargoDischGuard</object-name>
 		<action>
-			<button>1</button>
+			<button>0</button>
+			<repeatable>true</repeatable>
 			<binding>
+				<condition>
+					<property>devices/status/keyboard/shift</property>
+				</condition>
 				<command>property-assign</command>
 				<property>controls/OH/protectors/aftdisch</property>
 				<value>1</value>
 			</binding>
-			<mod-up>
-				<binding>
-					<command>property-assign</command>
-					<property>controls/OH/protectors/aftdisch</property>
-					<value>0</value>
-				</binding>
-				<binding>
-					<command>nasal</command>
-					<script>setprop("/sim/sounde/oh-cover", 1);</script>
-				</binding>
-			</mod-up>
+			<binding>
+				<condition>
+					<not>
+						<property>devices/status/keyboard/shift</property>
+					</not>
+				</condition>
+				<command>property-assign</command>
+				<property>controls/OH/protectors/aftdisch</property>
+				<value>0</value>
+			</binding>
+			<binding>
+				<condition>
+					<and>
+						<not>
+							<property>devices/status/keyboard/shift</property>
+						</not>
+						<not>
+							<property>controls/OH/protectors/aftdisch</property>
+						</not>
+					</and>
+				</condition>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/oh-cover", 1);</script>
+			</binding>
 		</action>
 	</animation>