Selection is not correctly preserved on navigation in the wysiwyg link and image dialogs

This affects the wikipage link, attachment link and image insertion dialogs and can be reproduced in the following way:
Images:

• open the image dialog
• select an image (from the current page or from another page) – say image.png
• hit select
• hit previous
• select the "upload new image" option
• hit select (image upload form appears)
• hit previous

now, in the image selection step, the image.png file will be selected instead of the new image option.
Similar behaviour is noticed for the link attachments wizard.