Folder + switch between list and gird mode bug

Once we are in a folder and switch between list and grid mode in the media library you jump back to category all files. This is very annoying, please consider improving and fixing this. I assume everyone who are in a folder and category and switch to list or grid mode wish to stay in the folder and not go back to all.