Single picture view when sorting by Album is not restricted to just the Album

Hi,
Basically, in the Sort By dropdown, you can select a particular Album to view, where you will see the thumbnails of the medias that belong in that album.

However, when you click on one of the media for the single media preview, and then click on the Next or Previous, it will just be the next media in the sequence and not necessarily belong in the Album you selected.

I would like to restrict the single view if I have filtered for a particular album. I was wodering if anyones know how to fix this?

Thanks.
Sarah