diff --git a/addons/maptools/CfgVehicles.hpp b/addons/maptools/CfgVehicles.hpp
index 8f0c95be92..aacde4cb93 100644
--- a/addons/maptools/CfgVehicles.hpp
+++ b/addons/maptools/CfgVehicles.hpp
@@ -52,7 +52,7 @@ class CfgVehicles {
                 };
                 class ACE_MapToolsAlignCompass {
                     displayName = CSTRING(MapToolsAlignCompass);
-                    condition = QUOTE((GVAR(mapTool_Shown) != 0) && {'ItemCompass' in assigneditems ACE_player});
+                    condition = QUOTE(GVAR(mapTool_Shown) != 0 && {getUnitLoadout ACE_player param [ARR_2(9, [])] param [ARR_2(3, '')] != ''});
                     statement = QUOTE(GVAR(mapTool_angle) = getDir ACE_player;);
                     exceptions[] = {"isNotDragging", "notOnMap", "isNotInside", "isNotSitting"};
                     showDisabled = 1;
diff --git a/addons/maptools/functions/fnc_canUseMapTools.sqf b/addons/maptools/functions/fnc_canUseMapTools.sqf
index 3196507388..0ae75c8c53 100644
--- a/addons/maptools/functions/fnc_canUseMapTools.sqf
+++ b/addons/maptools/functions/fnc_canUseMapTools.sqf
@@ -17,7 +17,7 @@
 
 visibleMap &&
 {alive ACE_player} &&
-{getText (configFile >> "CfgWeapons" >> (assignedItems ACE_player param [0, ""]) >> "simulation") == "ItemMap"} &&
 {"ACE_MapTools" in (ACE_player call EFUNC(common,uniqueItems))} &&
 {!GVAR(mapTool_isDragging)} &&
-{!GVAR(mapTool_isRotating)}
+{!GVAR(mapTool_isRotating)} &&
+{getUnitLoadout ACE_player param [9, []] param [0, ""] != ""}