feature #1664: Fix clone dialogs