Improved controller hiding behaviour