Yeah, if I'm running a fast fix (like pull a battery, ect.) I'll usually arrange the screws in an orientation to how I pulled them out, but long fixes like the op had (or when your waiting for parts)... I put the back in.

Not a bad idea with the masking tape, guess a magnet would work too.