The dialog needs to not have a fixed width of 300px.
More tweaks to shelves.