Correctly close PSM

closes #4077
- Swap CSS toggling for new PSM closing method
Merge pull request #4079 from halfdan/4077-close-psm

Correctly close PSM