diff --git a/code/modules/mob/floating_message.dm b/code/modules/mob/floating_message.dm
index 12fe2f61a79..0cc155bc25a 100644
--- a/code/modules/mob/floating_message.dm
+++ b/code/modules/mob/floating_message.dm
@@ -6,7 +6,7 @@ var/list/floating_chat_colors = list()
 
 /atom/movable/proc/animate_chat(message, decl/language/language, small, list/show_to, duration)
 	set waitfor = FALSE
-	
+
 	var/style	//additional style params for the message
 	var/fontsize = 6
 	if(small)
@@ -35,24 +35,24 @@ var/list/floating_chat_colors = list()
 			else
 				C.images += gibberish
 
-/proc/generate_floating_text(atom/movable/holder, message, style, size, duration, show_to)	
+/proc/generate_floating_text(atom/movable/holder, message, style, size, duration, show_to)
 	var/image/I = image(null, holder)
-	I.layer=FLY_LAYER
+	I.plane = HUD_PLANE
+	I.layer = HUD_ABOVE_ITEM_LAYER
 	I.alpha = 0
 	I.maptext_width = 80
 	I.maptext_height = 64
 	I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
-	I.plane = EFFECTS_ABOVE_LIGHTING_PLANE
 	I.pixel_x = -round(I.maptext_width/2) + 16
 
 	style = "font-family: 'Small Fonts'; -dm-text-outline: 1 black; font-size: [size]px; [style]"
 	I.maptext = "<center><span style=\"[style]\">[message]</span></center>"
 	animate(I, 1, alpha = 255, pixel_y = 16)
-	
+
 	for(var/image/old in holder.stored_chat_text)
 		animate(old, 2, pixel_y = old.pixel_y + 8)
 	LAZYADD(holder.stored_chat_text, I)
-	
+
 	addtimer(CALLBACK(GLOBAL_PROC, .proc/remove_floating_text, holder, I), duration)
 	addtimer(CALLBACK(GLOBAL_PROC, .proc/remove_images_from_clients, I, show_to), duration + 2)
 
@@ -60,4 +60,4 @@ var/list/floating_chat_colors = list()
 
 /proc/remove_floating_text(atom/movable/holder, image/I)
 	animate(I, 2, pixel_y = I.pixel_y + 10, alpha = 0)
-	LAZYREMOVE(holder.stored_chat_text, I)
\ No newline at end of file
+	LAZYREMOVE(holder.stored_chat_text, I)