I have my stash on open shelving sorted by color. When I pull a pile of fabric and don't feel like putting it back where it belongs, I have a basket next to the stash shelves that I put the pile into to. When I feel like straightening up my sewing room, I put the fabric from the basket back where it belongs.