Problems during shipping zone editing in modal window mode

There are problems with adding/editing of "shipping zones" during "shipping type" editing. To replicate you need to edit existing shipping type, then visit "shipping zones" tab and open existing shipping zone for editing (notice, that new window for zone editing wasn't opened and existing windows was reused). Then hit "Save" button and instead of returning to shipping zone list we will see shipping type list (no editing) in that popup. Also changes inside shipping zones were not saved.