Sample Folder/Spacebar bugfix