Fixed edit mode state