diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index 4c05b1cf7a..22257e3cb5 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -147,6 +147,7 @@ if (isServer) then {
 
 ["setDir", {(_this select 0) setDir (_this select 1)}] call FUNC(addEventhandler);
 ["setFuel", {(_this select 0) setFuel (_this select 1)}] call FUNC(addEventhandler);
+["engineOn", {(_this select 0) engineOn (_this select 1)}] call FUNC(addEventhandler);
 ["setSpeaker", {(_this select 0) setSpeaker (_this select 1)}] call FUNC(addEventhandler);
 ["selectLeader", {(_this select 0) selectLeader (_this select 1)}] call FUNC(addEventHandler);
 ["setVelocity", {(_this select 0) setVelocity (_this select 1)}] call FUNC(addEventHandler);
diff --git a/addons/repair/ACE_Settings.hpp b/addons/repair/ACE_Settings.hpp
index c3c8daad16..9ee40529e7 100644
--- a/addons/repair/ACE_Settings.hpp
+++ b/addons/repair/ACE_Settings.hpp
@@ -77,4 +77,9 @@ class ACE_Settings {
         values[] = {"None", "ToolKit"};
         _values[] = {{}, {"ToolKit"}};
     };
+    class GVAR(autoShutOffEngineWhenStartingRepair) {
+        typeName = "BOOL";
+        value = 0;
+        category = ECSTRING(OptionsMenu,CategoryLogistics);
+    };
 };
diff --git a/addons/repair/functions/fnc_canRepair.sqf b/addons/repair/functions/fnc_canRepair.sqf
index f7c3f60a8a..6027a34fd5 100644
--- a/addons/repair/functions/fnc_canRepair.sqf
+++ b/addons/repair/functions/fnc_canRepair.sqf
@@ -25,7 +25,8 @@ private ["_config", "_engineerRequired", "_items", "_return", "_condition", "_ve
 
 _config = (ConfigFile >> "ACE_Repair" >> "Actions" >> _className);
 if !(isClass _config) exitWith {false}; // or go for a default?
-if(isEngineOn _target) exitWith {false};
+
+// if(isEngineOn _target) exitWith {false}; // Ignore here so action shows, then exit and show warning when selected #3348
 
 _engineerRequired = if (isNumber (_config >> "requiredEngineer")) then {
     getNumber (_config >> "requiredEngineer");
diff --git a/addons/repair/functions/fnc_repair.sqf b/addons/repair/functions/fnc_repair.sqf
index 25e58151c5..f5b7d8cbfc 100644
--- a/addons/repair/functions/fnc_repair.sqf
+++ b/addons/repair/functions/fnc_repair.sqf
@@ -36,7 +36,14 @@ _engineerRequired = if (isNumber (_config >> "requiredEngineer")) then {
     0;
 };
 if !([_caller, _engineerRequired] call FUNC(isEngineer)) exitWith {false};
-if (isEngineOn _target) exitWith {false};
+
+if ((isEngineOn _target) && {GVAR(autoShutOffEngineWhenStartingRepair)}) then {
+    ["engineOn", _target, [_target, false]] call EFUNC(common,objectEvent);
+};
+if ((isEngineOn _target) && {!GVAR(autoShutOffEngineWhenStartingRepair)}) exitWith {
+    ["displayTextStructured", [LSTRING(shutOffEngineWarning), 1.5, _caller]] call EFUNC(common,localEvent);
+    false
+};
 
 //Items can be an array of required items or a string to a ACE_Setting array
 _items = if (isArray (_config >> "items")) then {
diff --git a/addons/repair/stringtable.xml b/addons/repair/stringtable.xml
index fb505f4f4e..ee79a1d427 100644
--- a/addons/repair/stringtable.xml
+++ b/addons/repair/stringtable.xml
@@ -1316,5 +1316,10 @@
             <Italian>Oggetti richiesti per riparare/rimuovere ruote</Italian>
             <French>Items exigés pour enlever/remplacer les roues</French>
         </Key>
+        <Key ID="STR_ACE_Repair_shutOffEngineWarning">
+            <English>Engine must be off to repair</English>
+            <German>Motor muss ausgeschaltet zu reparieren sein</German>
+            <Spanish>El motor necesita desactivado para la reparación</Spanish>
+        </Key>
     </Package>
 </Project>