diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm
index 0822dca375..30ff2c1d2c 100644
--- a/code/modules/mob/living/bot/bot.dm
+++ b/code/modules/mob/living/bot/bot.dm
@@ -197,6 +197,12 @@
 			else
 				startPatrol()
 		else
+			if((locate(/obj/machinery/door) in loc) && !pulledby) //Don't hang around blocking doors, but don't run off if someone tries to pull us through one.
+				var/turf/my_turf = get_turf(src)
+				var/list/can_go = my_turf.CardinalTurfsWithAccess(botcard)
+				if(LAZYLEN(can_go))
+					if(step_towards(src, pick(can_go)))
+						return
 			handleIdle()
 
 /mob/living/bot/proc/handleRegular()
diff --git a/html/changelogs/meghan rossi - bots clear doorways.yml b/html/changelogs/meghan rossi - bots clear doorways.yml
new file mode 100644
index 0000000000..87fe0d79be
--- /dev/null
+++ b/html/changelogs/meghan rossi - bots clear doorways.yml	
@@ -0,0 +1,4 @@
+author: Meghan Rossi
+delete-after: True
+changes: 
+  - tweak: "Bots that are idle in doorways (including firedoors and blastdoors) will move out of the way."
\ No newline at end of file