Allow 'When' to have more space