diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 3b65c5edf27..604f6f82fb2 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -616,6 +616,9 @@
 			if(cell)
 				user.visible_message("<span class='notice'>\The [user] begins clasping shut \the [src]'s maintenance hatch.</span>", "<span class='notice'>You begin closing up \the [src].</span>")
 				if(do_after(user, 50/W.toolspeed, src))
+					if(!Adjacent(user))
+						to_chat(user, SPAN_NOTICE("You are too far from \the [src]'s to open its hatch."))
+						return
 					to_chat(user, "<span class='notice'>You close \the [src]'s maintenance hatch.</span>")
 					opened = 0
 					updateicon()
@@ -667,6 +670,9 @@
 			else
 				user.visible_message("<span class='notice'>\The [user] begins prying open \the [src]'s maintenance hatch.</span>", "<span class='notice'>You start opening \the [src]'s maintenance hatch.</span>")
 				if(do_after(user, 50/W.toolspeed, src))
+					if(!Adjacent(user))
+						to_chat(user, SPAN_NOTICE("You are too far from \the [src]'s to close its hatch."))
+						return
 					to_chat(user, "<span class='notice'>You open \the [src]'s maintenance hatch.</span>")
 					opened = 1
 					updateicon()
diff --git a/html/changelogs/no_long_crowbars.yml b/html/changelogs/no_long_crowbars.yml
new file mode 100644
index 00000000000..18625f72a7e
--- /dev/null
+++ b/html/changelogs/no_long_crowbars.yml
@@ -0,0 +1,6 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes: 
+  - bugfix: "Robots moving away while someone tries to crowbar them open/closed will now properly cancel the opening/closing."
\ No newline at end of file