Ticket #917: Add scrollbars to popup