diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index b041aa13e70..4016a76a44f 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -6,6 +6,7 @@
 	name = " "
 	var/base_name = " "
 	desc = " "
+	var/base_desc = " "
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "null"
 	item_state = "null"
@@ -48,6 +49,7 @@
 /obj/item/weapon/reagent_containers/glass/New()
 	..()
 	base_name = name
+	base_desc = desc
 
 /obj/item/weapon/reagent_containers/glass/examine(var/mob/user)
 	if(!..(user, 2))
@@ -99,8 +101,12 @@
 /obj/item/weapon/reagent_containers/glass/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen))
 		var/tmp_label = sanitizeSafe(input(user, "Enter a label for [name]", "Label", label_text), MAX_NAME_LEN)
-		if(length(tmp_label) > 10)
-			user << "<span class='notice'>The label can be at most 10 characters long.</span>"
+		if(length(tmp_label) > 50)
+			user << "<span class='notice'>The label can be at most 50 characters long.</span>"
+		else if(length(tmp_label) > 10)
+			user << "<span class='notice'>You set the label.</span>"
+			label_text = tmp_label
+			update_name_label()
 		else
 			user << "<span class='notice'>You set the label to \"[tmp_label]\".</span>"
 			label_text = tmp_label
@@ -109,8 +115,12 @@
 /obj/item/weapon/reagent_containers/glass/proc/update_name_label()
 	if(label_text == "")
 		name = base_name
+	else if(length(label_text) > 10)
+		var/short_label_text = copytext(label_text, 1, 11)
+		name = "[base_name] ([short_label_text]...)"
 	else
 		name = "[base_name] ([label_text])"
+	desc = "[base_desc] It is labeled \"[label_text]\"."
 
 /obj/item/weapon/reagent_containers/glass/beaker
 	name = "beaker"
diff --git a/html/changelogs/MagmaRam - Beaker Labels.yml b/html/changelogs/MagmaRam - Beaker Labels.yml
new file mode 100644
index 00000000000..581e0f80aae
--- /dev/null
+++ b/html/changelogs/MagmaRam - Beaker Labels.yml	
@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: MagmaRam
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Beakers can now have longer labels."