2nd attempt to fix the weird sidebar behaviour in the master