diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm
index 7fe4c9f620..c3988ff2ff 100644
--- a/code/modules/projectiles/targeting.dm
+++ b/code/modules/projectiles/targeting.dm
@@ -34,7 +34,7 @@
 			user.client.remove_gun_icons()
 	return ..()
 
-//Removes lock fro mall targets
+//Removes lock from all targets
 /obj/item/weapon/gun/proc/stop_aim()
 	if(aim_targets)
 		for(var/mob/living/M in aim_targets)
@@ -272,6 +272,7 @@
 		screen -= usr.gun_run_icon
 
 /client/verb/ToggleGunMode()
+	set name = "Toggle Gun Mode"
 	set hidden = 1
 	gun_mode = !gun_mode
 	if(gun_mode)
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 8eee4e1817..a8ae16d887 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -341,6 +341,14 @@ macro "hotkeymode"
 		name = "CTRL+H"
 		command = "holster"
 		is-disabled = false
+	elem 
+		name = "J"
+		command = "toggle-gun-mode"
+		is-disabled = false
+	elem 
+		name = "CTRL+J"
+		command = "toggle-gun-mode"
+		is-disabled = false
 	elem 
 		name = "Q"
 		command = ".northwest"