diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 07f31a6678d..c6ff1233a06 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -192,10 +192,11 @@
 
 /obj/item/assembly/infra/Topic(href, href_list)
 	..()
-	if(usr.incapacitated() || !in_range(loc, usr))
+	if(!usr.canUseTopic(src, BE_CLOSE))
 		usr << browse(null, "window=infra")
 		onclose(usr, "infra")
 		return
+
 	if(href_list["state"])
 		on = !(on)
 		update_icon()
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 97b4543a059..a8ce66b50f2 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -131,7 +131,7 @@
 
 /obj/item/assembly/prox_sensor/Topic(href, href_list)
 	..()
-	if(usr.incapacitated() || !in_range(loc, usr))
+	if(!usr.canUseTopic(src, BE_CLOSE))
 		usr << browse(null, "window=prox")
 		onclose(usr, "prox")
 		return