Move EDT action to upper level in order to avoid assertions