diff --git a/AUTHORS.txt b/AUTHORS.txt
index 43e1eeb21e..a23275317f 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -51,6 +51,7 @@ Brakoviejo
 Brisse <brisse@outlook.com>
 Brostrom.A | Evul <andreas.brostrom.ce@gmail.com>
 BullHorn <bullhorn7@gmail.com>
+chris579 <github@klemm.one>
 Clon1998 <ps.patti1998@gmail.com>
 Codingboy
 Coren <coren4@gmail.com>
diff --git a/addons/zeus/functions/fnc_getModuleDestination.sqf b/addons/zeus/functions/fnc_getModuleDestination.sqf
index d6a19d69b1..138d8342a5 100644
--- a/addons/zeus/functions/fnc_getModuleDestination.sqf
+++ b/addons/zeus/functions/fnc_getModuleDestination.sqf
@@ -5,10 +5,16 @@
  * Arguments:
  * 0: The souce object <OBJECT>
  * 1: Code to run when position is ready <CODE>
- * - Code is passed [0: Successful <BOOL>, 1: Object <OBJECT>, 2: Position ASL <ARRAY>]
- * 2: Text <STRING><OPTIONAL>
- * 3: Icon image file <STRING><OPTIONAL>
- * 4: Icon color <ARRAY><OPTIONAL>
+ * - Code is passed
+ *  0: Successful <BOOL>
+ *  1: Object <OBJECT>
+ *  2: Position ASL <ARRAY>
+ *  3: State of Shift <BOOL>
+ *  4: State of Ctrl <BOOL>
+ *  5: State of Alt <BOOL>
+ * 2: Text <STRING> (default: "")
+ * 3: Icon image file <STRING> (default: "\a3\ui_f\data\IGUI\Cfg\Cursors\select_target_ca.paa")
+ * 4: Icon color <ARRAY> (default: [1,0,0,1])
  *
  * Return Value:
  * None
@@ -23,17 +29,22 @@
 params ["_object", "_code", ["_text", ""], ["_icon", "\a3\ui_f\data\IGUI\Cfg\Cursors\select_target_ca.paa"], ["_color", [1,0,0,1]]];
 
 if (missionNamespace getVariable [QGVAR(moduleDestination_running), false]) exitWith {
-    [false, _object, [0,0,0]] call _code;
+    [false, _object, [0,0,0], false, false, false] call _code;
     ERROR("getModuleDestination already running");
 };
 
 GVAR(moduleDestination_running) = true;
 
 // Add mouse button eh for the zeus display (triggered from 2d or 3d)
-GVAR(moduleDestination_displayEH) = [(findDisplay 312), "mouseButtonDown", {
-    params ["", "_mouseButton"];
+GVAR(moduleDestination_displayEHMouse) = [findDisplay 312, "mouseButtonDown", {
+    params ["", "_mouseButton", "", "", "_shift", "_ctrl", "_alt"];
+
     if (_mouseButton != 0) exitWith {}; // Only watch for LMB
+    TRACE_2("placed",_object,_mousePosASL);
+
     _thisArgs params ["_object", "_code"];
+
+    // Get mouse position on 2D map or 3D world
     private _mousePosASL = if (ctrlShown ((findDisplay 312) displayCtrl 50)) then {
         private _pos2d = (((findDisplay 312) displayCtrl 50) ctrlMapScreenToWorld getMousePosition);
         _pos2d set [2, getTerrainHeightASL _pos2d];
@@ -41,12 +52,35 @@ GVAR(moduleDestination_displayEH) = [(findDisplay 312), "mouseButtonDown", {
     } else {
         AGLToASL (screenToWorld getMousePosition);
     };
-    TRACE_2("placed",_object,_mousePosASL);
-    [true, _object, _mousePosASL] call _code;
+
+    [true, _object, _mousePosASL, _shift, _ctrl, _alt] call _code;
     GVAR(moduleDestination_running) = false;
 }, [_object, _code]] call CBA_fnc_addBISEventHandler;
 
-// Add draw eh for the zeus map - draws the 2d icon and line
+// Add key eh for the zeus display (triggered from 2d or 3d)
+GVAR(moduleDestination_displayEHKeyboard) = [findDisplay 312, "KeyDown", {
+    params ["", "_keyCode", "_shift", "_ctrl", "_alt"];
+
+    if (_keyCode != 1) exitWith {}; // Only watch for ESC
+    TRACE_2("aborted",_object,_mousePosASL);
+
+    _thisArgs params ["_object", "_code"];
+
+    // Get mouse position on 2D map or 3D world
+    private _mousePosASL = if (ctrlShown ((findDisplay 312) displayCtrl 50)) then {
+        private _pos2d = (((findDisplay 312) displayCtrl 50) ctrlMapScreenToWorld getMousePosition);
+        _pos2d set [2, getTerrainHeightASL _pos2d];
+        _pos2d
+    } else {
+        AGLToASL (screenToWorld getMousePosition);
+    };
+
+    [false, _object, _mousePosASL, _shift, _ctrl, _alt] call _code;
+    GVAR(moduleDestination_running) = false;
+    true
+}, [_object, _code]] call CBA_fnc_addBISEventHandler;
+
+// Add draw EH for the zeus map - draws the 2D icon and line
 GVAR(moduleDestination_mapDrawEH) = [((findDisplay 312) displayCtrl 50), "draw", {
     params ["_mapCtrl"];
     _thisArgs params ["_object", "_text", "_icon", "_color"];
@@ -56,12 +90,13 @@ GVAR(moduleDestination_mapDrawEH) = [((findDisplay 312) displayCtrl 50), "draw",
     _mapCtrl drawLine [getPos _object, _pos2d, _color];
 }, [_object, _text, _icon, _color]] call CBA_fnc_addBISEventHandler;
 
+// Add draw EH for 3D camera view - draws the 3D icon and line
 [{
     (_this select 0) params ["_object", "_code", "_text", "_icon", "_color"];
     if ((isNull _object) || {isNull findDisplay 312} || {!isNull findDisplay 49}) then {
         TRACE_3("null-exit",isNull _object,isNull findDisplay 312,isNull findDisplay 49);
         GVAR(moduleDestination_running) = false;
-        [false, _object, [0,0,0]] call _code;
+        [false, _object, [0,0,0], false, false, false] call _code;
     };
     if (GVAR(moduleDestination_running)) then {
         // Draw the 3d icon and line
@@ -69,11 +104,13 @@ GVAR(moduleDestination_mapDrawEH) = [((findDisplay 312) displayCtrl 50), "draw",
         drawIcon3D [_icon, _color, _mousePosAGL, 1.5, 1.5, 45, _text];
         drawLine3D [_mousePosAGL, ASLtoAGL (getPosASL _object), _color];;
     } else {
-        TRACE_3("cleaning up",_this select 1, GVAR(moduleDestination_displayEH), GVAR(moduleDestination_mapDrawEH));
+        TRACE_4("cleaning up",_this select 1,GVAR(moduleDestination_displayEHMouse),GVAR(moduleDestination_displayEHKeyboard),GVAR(moduleDestination_mapDrawEH));
         (_this select 1) call CBA_fnc_removePerFrameHandler;
-        (findDisplay 312) displayRemoveEventHandler ["mouseButtonDown", GVAR(moduleDestination_displayEH)];
+        (findDisplay 312) displayRemoveEventHandler ["mouseButtonDown", GVAR(moduleDestination_displayEHMouse)];
+        (findDisplay 312) displayRemoveEventHandler ["KeyDown", GVAR(moduleDestination_displayEHKeyboard)];
         ((findDisplay 312) displayCtrl 50) ctrlRemoveEventHandler ["draw", GVAR(moduleDestination_mapDrawEH)];
-        GVAR(moduleDestination_displayEH) = nil;
+        GVAR(moduleDestination_displayEHMouse) = nil;
+        GVAR(moduleDestination_displayEHKeyboard) = nil;
         GVAR(moduleDestination_mapDrawEH) = nil;
     };
 }, 0, [_object, _code, _text, _icon, _color]] call CBA_fnc_addPerFrameHandler;