Issue #887/#888

The PR includes fixes for #887 and #888 (file vesron).
I have done it.
I thought to set "Ask me next time" to bottom of page, but it doesn't look fine because the dialog is small.