diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 856dce11be8..69d9dfe534a 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -126,13 +126,19 @@
 		if(!C.incapacitated())
 			if(C.internal)
 				C.internal = null
-				C << "<span class='notice'>No longer running on internals.</span>"
+				C << "<span class='notice'>You are no longer running on internals.</span>"
 				icon_state = "internal0"
 			else
 				if(!istype(C.wear_mask, /obj/item/clothing/mask))
-					C << "<span class='notice'>You are not wearing a mask.</span>"
+					C << "<span class='warning'>You are not wearing an internals mask!</span>"
 					return 1
 				else
+					var/obj/item/clothing/mask/M = C.wear_mask
+					if(M.mask_adjusted) // if mask on face but pushed down
+						M.adjustmask(C) // adjust it back
+					if( !(M.flags & MASKINTERNALS) )
+						C << "<span class='warning'>You are not wearing an internals mask!</span>"
+						return
 					if(istype(C.l_hand, /obj/item/weapon/tank))
 						C << "<span class='notice'>You are now running on internals from the [C.l_hand] on your left hand.</span>"
 						C.internal = C.l_hand
@@ -162,7 +168,7 @@
 					if(C.internal)
 						icon_state = "internal1"
 					else
-						C << "<span class='notice'>You don't have an oxygen tank.</span>"
+						C << "<span class='warning'>You don't have an oxygen tank!</span>"
 
 /obj/screen/mov_intent
 	name = "run/walk toggle"
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 65205405358..4878387b59e 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -106,7 +106,7 @@ BLIND     // can't see anything
 //Proc that moves gas/breath masks out of the way, disabling them and allowing pill/food consumption
 /obj/item/clothing/mask/proc/adjustmask(var/mob/user)
 	if(!ignore_maskadjust)
-		if(!user.canmove || user.stat || user.restrained())
+		if(user.incapacitated())
 			return
 		if(src.mask_adjusted == 1)
 			src.icon_state = initial(icon_state)
@@ -131,6 +131,7 @@ BLIND     // can't see anything
 
 
 
+
 //Shoes
 /obj/item/clothing/shoes
 	name = "shoes"