diff --git a/code/_helpers/icons.dm b/code/_helpers/icons.dm
index a199c88622..24fd396bb2 100644
--- a/code/_helpers/icons.dm
+++ b/code/_helpers/icons.dm
@@ -367,6 +367,13 @@ proc/ReadRGB(rgb)
 	. = list(r, g, b)
 	if(usealpha) . += alpha
 
+proc/RGBdec2hex(var/list/values)
+	var/string = ""
+	while(values.len)
+		string = "[num2text(values[values.len], 2, 16)][string]"
+		values.len--
+	return "#[string]"
+
 proc/ReadHSV(hsv)
 	if(!hsv) return
 
diff --git a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm
index 48e7cb8375..6629a96a9f 100644
--- a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm
+++ b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm
@@ -173,7 +173,8 @@ var/list/wrapped_species_by_ref = list()
 
 	last_special = world.time + 50
 
-	var/new_skin = input("Please select a new body color.", "Shapeshifter Colour") as color
+	var/current = RGBdec2hex(list(r_skin, g_skin, b_skin))
+	var/new_skin = input("Please select a new body color.", "Shapeshifter Colour", current) as null|color
 	if(!new_skin)
 		return
 	shapeshifter_set_colour(new_skin)