diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm
index f4715c8f1c..d9aacdcaca 100644
--- a/code/modules/admin/verbs/buildmode.dm
+++ b/code/modules/admin/verbs/buildmode.dm
@@ -627,6 +627,9 @@
 /obj/effect/bmode/buildmode/proc/get_path_from_partial_text(default_path)
 	var/desired_path = tgui_input_text(usr, "Enter full or partial typepath.","Typepath","[default_path]")
 
+	if(!desired_path)	//VOREStation Add - If you don't give it anything it builds a list of every possible thing in the game and crashes your client.
+		return			//VOREStation Add - And the main way for it to do that is to push the cancel button, which should just do nothing. :U
+
 	var/list/types = typesof(/atom)
 	var/list/matches = list()
 
@@ -705,4 +708,4 @@
 #undef BUILDMODE_CONTENTS
 #undef BUILDMODE_LIGHTS
 #undef BUILDMODE_AI
-#undef LAST_BUILDMODE
\ No newline at end of file
+#undef LAST_BUILDMODE