Loading a track from laptop resets where you were in USB drive attached

I noticed this weekend a new issue, maybe 2.2 related? 

I play 90% of my jobs from a usb SSD drive, I keep the laptop linked in case I need to search for a track quick, When I do this and drop a track from RB to a player it works great but then I hit USB on the deck to go back and I am at the root of the drive where it shows the the amount of tracks instead of it being in the playlist I was in last. 

This is really annoying if you jump back and forth between RB and a usb drive during gigs, it used to work flawlessly but lately it does this.