diff --git a/code/modules/spells/spell_types/shapeshift.dm b/code/modules/spells/spell_types/shapeshift.dm
index 456d98c7fcd..b0b18b9d8f6 100644
--- a/code/modules/spells/spell_types/shapeshift.dm
+++ b/code/modules/spells/spell_types/shapeshift.dm
@@ -27,7 +27,10 @@
 			for(var/path in possible_shapes)
 				var/mob/living/simple_animal/A = path
 				animal_list[initial(A.name)] = path
-			shapeshift_type = input(M, "Choose Your Animal Form!", "It's Morphing Time!", null) as anything in animal_list
+			var/new_shapeshift_type = input(M, "Choose Your Animal Form!", "It's Morphing Time!", null) as anything in animal_list
+			if(shapeshift_type)
+				return
+			shapeshift_type = new_shapeshift_type
 			if(!shapeshift_type) //If you aren't gonna decide I am!
 				shapeshift_type = pick(animal_list)
 			shapeshift_type = animal_list[shapeshift_type]
@@ -80,4 +83,4 @@
 	shapeshift_type = /mob/living/simple_animal/hostile/megafauna/dragon/lesser
 	list/current_shapes = list(/mob/living/simple_animal/hostile/megafauna/dragon/lesser)
 	list/current_casters = list()
-	list/possible_shapes = list(/mob/living/simple_animal/hostile/megafauna/dragon/lesser)
\ No newline at end of file
+	list/possible_shapes = list(/mob/living/simple_animal/hostile/megafauna/dragon/lesser)