diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 4b637be13f8..59bb2140048 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -383,14 +383,15 @@
 	if(custom_name)
 		return FALSE
 
-	var/newname
-	newname = sanitizeSafe(input(src, "You are a robot. Enter a name, or leave blank for the default name.", "Name change") as text, MAX_NAME_LEN)
-	if(newname)
-		custom_name = newname
+	spawn(0)
+		var/newname
+		newname = sanitizeSafe(input(src, "You are a robot. Enter a name, or leave blank for the default name.", "Name change") as text, MAX_NAME_LEN)
+		if(newname)
+			custom_name = newname
 
-	updatename()
-	updateicon()
-	SSrecords.reset_manifest()
+		updatename()
+		updateicon()
+		SSrecords.reset_manifest()
 
 // this verb lets cyborgs see the stations manifest
 /mob/living/silicon/robot/verb/cmd_station_manifest()
diff --git a/html/changelogs/alberyk-borgname.yml b/html/changelogs/alberyk-borgname.yml
new file mode 100644
index 00000000000..0250c371c4b
--- /dev/null
+++ b/html/changelogs/alberyk-borgname.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - bugfix: "Fixed round start delay caused by cyborgs choosing their names."