Added check for placing save/cancel dialog for highlighting.
And added dispose statement for indicator.