diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index 8819020e3a..71de04ee99 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -3,7 +3,6 @@
 	desc = "A remote control switch."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "doorctrl"
-	plane = ABOVE_WALL_PLANE
 	var/skin = "doorctrl"
 	power_channel = ENVIRON
 	var/obj/item/assembly/device
@@ -17,10 +16,13 @@
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 
 /obj/machinery/button/Initialize(mapload, ndir = 0, built = 0)
-	if(istext(id) && mapload)
-		if(id[1] == "!")
-			id = SSmapping.get_obfuscated_id(id)
+	if(istext(id) && mapload && id[1] == "!")
+		id = SSmapping.get_obfuscated_id(id)
 	. = ..()
+	var/turf/T = get_turf_pixel(src)
+	if(iswallturf(T))
+		plane = ABOVE_WALL_PLANE
+
 	if(built)
 		setDir(ndir)
 		pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
@@ -28,7 +30,6 @@
 		panel_open = TRUE
 		update_icon()
 
-
 	if(!built && !device && device_type)
 		device = new device_type(src)
 
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 967ee02f82..450967050c 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -169,13 +169,18 @@
 	desc = "Used for watching an empty arena."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "telescreen"
-	plane = ABOVE_WALL_PLANE
 	network = list("thunder")
 	density = FALSE
 	circuit = null
 	clockwork = TRUE //it'd look very weird
 	light_power = 0
 
+/obj/machinery/computer/security/telescreen/Initialize()
+	. = ..()
+	var/turf/T = get_turf_pixel(src)
+	if(iswallturf(T))
+		plane = ABOVE_WALL_PLANE
+
 /obj/machinery/computer/security/telescreen/update_icon_state()
 	icon_state = initial(icon_state)
 	if(stat & BROKEN)