Fixed edit action mode behavior