diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index 70612872db3..b5d5e339433 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -11,7 +11,9 @@
 /obj/item/device/assembly/mousetrap/examine(mob/user)
 	..()
 	if(armed)
-		user << "It looks like it's armed."
+		user << "The mousetrap is armed!"
+	else
+		user << "The mousetrap is not armed."
 
 /obj/item/device/assembly/mousetrap/activate()
 	if(..())
@@ -113,6 +115,8 @@
 						triggered(H)
 						H.visible_message("<span class='warning'>[H] accidentally steps on [src].</span>", \
 										  "<span class='warning'>You accidentally step on [src]</span>")
+				else if(ismouse(MM))
+					triggered(MM)
 		else if(AM.density) // For mousetrap grenades, set off by anything heavy
 			triggered(AM)
 	..()