diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index 966e3f15688..587031fa810 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -7,7 +7,7 @@
 	opacity = 0
 	anchored = 1
 	density = 0
-	layer = OBJ_LAYER + 0.05 //above table, below windoor/airlock/foamed metal.
+	layer = OBJ_LAYER - 0.5 //above table, below windoor/airlock/foamed metal.
 	mouse_opacity = 0
 	var/amount = 3
 	animate_movement = 0
@@ -91,14 +91,8 @@
 
 
 /obj/effect/effect/foam/proc/spread_foam()
-	for(var/direction in cardinal)
-		var/turf/T = get_step(src,direction)
-		if(!T)
-			continue
-
-		if(!T.Enter(src))
-			continue
-
+	var/turf/t_loc = get_turf(src)
+	for(var/turf/T in t_loc.GetAtmosAdjacentTurfs())
 		var/obj/effect/effect/foam/foundfoam = locate() in T //Don't spread foam where there's already foam!
 		if(foundfoam)
 			continue
diff --git a/html/changelogs/xxalpha-PLmD_69pXpk.yml b/html/changelogs/xxalpha-PLmD_69pXpk.yml
new file mode 100644
index 00000000000..0d6252a37aa
--- /dev/null
+++ b/html/changelogs/xxalpha-PLmD_69pXpk.yml
@@ -0,0 +1,7 @@
+author: xxalpha
+
+delete-after: True
+
+changes:
+  - tweak: "Changed foam spreading to be like gas spreading."
+