What year is the car?
Do you know the check engine light code at this time?
If not then I'd suggest you get the code so everyone doesn't sit here and guess
your problem. The idle problem and CEL could very well be linked.

It could be the idle air control valve or fast idle thermo valve (A/T model only).