when you add highlighting would it not be better to open the note entry window with the "no icon" selected so annotations can be added at same time if required..
I guess its just me but dont see need/use for current highlighing menu unless once you select color the dialog closes automatically as "done" button only seems to slow down entry