Fix #434: modals for move/merge actions