diff --git a/doc/fixes34.4 b/doc/fixes34.4
index c801cd4b2..b5f5ee46f 100644
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -54,6 +54,7 @@ ensure that a sleeping steed doesn't answer a #chat
 eliminate two very minor anomalies when using Luck to adjust random numbers
 destroying a worn item via dipping in burning oil would not unwear/unwield
 	the item properly, possibly leading to various strange behaviors
+avoid a panic splitbill when shopkeeper is trapped by the door
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/shk.c b/src/shk.c
index b23226f8b..60a74eba8 100644
--- a/src/shk.c
+++ b/src/shk.c
@@ -3228,7 +3228,7 @@ register struct monst *shkp;
 		    Such voluntary abandonment left unpaid objects in
 		    invent, triggering billing impossibilities on the
 		    next level once the character fell through the hole.] */
-		if (udist > 4 && eshkp->following)
+		if (udist > 4 && eshkp->following && !eshkp->billct)
 		    return(-1);	/* leave it to m_move */
 		gx = u.ux;
 		gy = u.uy;