Quick fix to avoid issues with edit view close.