SD-825 : Desk dropdown

Fixed, and also made a small fix that was breaking SD-769