diff --git a/code/modules/heavy_vehicle/mech_interaction.dm b/code/modules/heavy_vehicle/mech_interaction.dm
index fc87cb523ac..a79151b8e87 100644
--- a/code/modules/heavy_vehicle/mech_interaction.dm
+++ b/code/modules/heavy_vehicle/mech_interaction.dm
@@ -42,17 +42,17 @@
 		return
 
 	if(modifiers["alt"])
-		if(selected_system)
-			if(selected_system == A)
-				selected_system.attack_self(user)
-				setClickCooldown(5)
+		var/obj/item/mecha_equipment/ME = A
+		if(istype(ME))
+			ME.attack_self(user)
+			setClickCooldown(5)
 			return
 
 	if(modifiers["ctrl"])
-		if(selected_system)
-			if(selected_system == A)
-				selected_system.CtrlClick(user)
-				setClickCooldown(5)
+		var/obj/item/mecha_equipment/ME = A
+		if(istype(ME))
+			ME.CtrlClick(user)
+			setClickCooldown(5)
 			return
 
 	if(!(user in pilots) && user != src)
diff --git a/html/changelogs/geeves-exosuit_convenience.yml b/html/changelogs/geeves-exosuit_convenience.yml
new file mode 100644
index 00000000000..574581c4a90
--- /dev/null
+++ b/html/changelogs/geeves-exosuit_convenience.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - tweak: "You can now Ctrl and Alt click on mech equipment without having to select them first."
\ No newline at end of file