diff --git a/src/map/npc.c b/src/map/npc.c
index 6519c46cb0..4de48474ff 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1360,8 +1360,6 @@ int npc_buysellsel(struct map_session_data* sd, int id, int type)
 		clif_broadcast(&sd->bl,output,strlen(output) + 1,BC_BLUE,SELF);
 	}
 
-	// reset the callshop state for future calls
-	sd->state.callshop = 0;
 	sd->npc_shopid = id;
 
 	if (type == 0) {
diff --git a/src/map/script.c b/src/map/script.c
index e2a656c4ba..30ab5fded2 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -9382,8 +9382,12 @@ BUILDIN_FUNC(end)
 	if( st->mes_active )
 		st->mes_active = 0;
 
-	if (sd)
-		clif_scriptclose(sd, st->oid); // If a menu/select/prompt is active, close it.
+	if (sd){
+		if (sd->state.callshop == 0)
+			clif_scriptclose(sd, st->oid); // If a menu/select/prompt is active, close it.
+		else 
+			sd->state.callshop = 0;
+	}
 
 	return SCRIPT_CMD_SUCCESS;
 }