Webplayer - shuffle not working well

[aic]

I know this is low on the list of priorities given the other issues Webplayer is showing (play.spotify.com still doesn't redirect to open.spotify.com for me in Firefox, even though I cleared cookies, cache, etc.).

My main playlist has ~600 songs. Most of the time I leave it on shuffle, but sometimes I switch over and click to play a specific song. Whenever I do that, the shuffle then only stays within a group that is very close to that song (within ~40 song radius), even repeating several of those songs until I select a different one. Is this by design? I'd personally rather it shuffle through the entire playlist again.