Shuffle should only use search results if search is active

Right now if I search for "ghostface" and shuffle is active and I play a song from the results, the next song shuffle decides to play is NOT in the search results, but instead is from the total Library. The intended behavior should be that shuffle only plays results from the search until the search is cleared.