diff --git a/Input/Joysticks/ThrustMaster/Warthog/Warthog-Stick.xml b/Input/Joysticks/ThrustMaster/Warthog/Warthog-Stick.xml
index 614cb4d44..c589a5a29 100644
--- a/Input/Joysticks/ThrustMaster/Warthog/Warthog-Stick.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog/Warthog-Stick.xml
@@ -16,6 +16,7 @@
 		<command>nasal</command>
 		<script>
 			var this = cmdarg().getParent();
+			var init = !contains(caller(0)[0], "init");
 			var popup = func gui.popupTip(call(sprintf, arg));
 			var is_helicopter = (var _ = props.globals.getNode("rotors", 0)) != nil and _.getAttribute("children");
 			var aircraft_type = getprop("/sim/type");
@@ -23,7 +24,7 @@
 
 			var load_overlay = func(name) {
 				foreach (var dir; [getprop("/sim/fg-home"), getprop("/sim/fg-root")]) {
-					var file = dir ~ "/Input/Joysticks/ThrustMaster/Warthog/Joystick/" ~ name ~ ".xml";
+					var file = dir ~ "/Input/Joysticks/ThrustMaster/Warthog/Stick/" ~ name ~ ".xml";
 					if (io.stat(file) != nil) {
 						printlog("info", "WARTHOG: loading overlay " ~ file);
 						cmdarg().getNode("script").setValue("");
@@ -42,8 +43,10 @@
 			}
 
 			var mod = 0;
-			var _ = props.globals.initNode("/devices/status/joysticks/warthog/modifier", mod, "INT");
-			setlistener(_, func(n) mod = n.getValue());
+			if (init) {
+				var _ = props.globals.initNode("/devices/status/joysticks/warthog/modifier", mod, "INT");
+				setlistener(_, func(n) mod = n.getValue());
+			}
 
 			var trimstep = 0.75;
 			var viewstep = 0.5;
diff --git a/Input/Joysticks/ThrustMaster/Warthog/Warthog-Throttle.xml b/Input/Joysticks/ThrustMaster/Warthog/Warthog-Throttle.xml
index 3a81acb99..79dc23f2f 100644
--- a/Input/Joysticks/ThrustMaster/Warthog/Warthog-Throttle.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog/Warthog-Throttle.xml
@@ -12,6 +12,7 @@
 		<command>nasal</command>
 		<script>
 			var this = cmdarg().getParent();
+			var init = !contains(caller(0)[0], "init");
 			var popup = func gui.popupTip(call(sprintf, arg));
 			var is_helicopter = (var _ = props.globals.getNode("rotors", 0)) != nil and _.getAttribute("children");
 			var aircraft_type = getprop("/sim/type");
@@ -38,8 +39,10 @@
 			}
 
 			var mod = 0;
-			var _ = props.globals.initNode("/devices/status/joysticks/warthog/modifier", mod, "INT");
-			setlistener(_, func(n) mod = n.getValue());
+			if (init) {
+				var _ = props.globals.initNode("/devices/status/joysticks/warthog/modifier", mod, "INT");
+				setlistener(_, func(n) mod = n.getValue());
+			}
 
 			var left_engines = [0, 2, 4, 6, 8, 10];
 			var right_engines = [1, 3, 5, 7, 9, 11];