Shape: Fix size calculations in loading to use better strategy (similar to popup)