diff --git a/doc/fixes34.3 b/doc/fixes34.3
index 5dc45d419..c61444444 100644
--- a/doc/fixes34.3
+++ b/doc/fixes34.3
@@ -17,6 +17,8 @@ approaching Medusa while having reflection+invisibility+esp would cause her
 	to turn herself to stone if you happened to be blind at the time
 Master Kaen's death message was not appropriate
 missing fountain tag in minend-3
+do not pacify shopkeeper when the hero enters a shop if that hero previously
+	angered the shopkeeper without ever visibly entering the shop
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/shk.c b/src/shk.c
index eb80d46e2..32568d3dd 100644
--- a/src/shk.c
+++ b/src/shk.c
@@ -522,7 +522,8 @@ register char *enterstring;
 
 	eshkp->bill_p = &(eshkp->bill[0]);
 
-	if (!eshkp->visitct || strncmpi(eshkp->customer, plname, PL_NSIZ)) {
+	if ((!eshkp->visitct || *eshkp->customer) &&
+	    strncmpi(eshkp->customer, plname, PL_NSIZ)) {
 	    /* You seem to be new here */
 	    eshkp->visitct = 0;
 	    eshkp->following = 0;