Underline space at end of line

Working in CS4, I am creating a table of contents with text that is underlined (links). When a title wraps onto the next line, the space after the last word on the first line is underlined. I don't want the space underlined. If I delete the space, then there is no spacing between the words. I have to manually go in and select the space and un-select underline.



Any ideas? Is there a text wrap setting (not text wrap around an image, but text that wraps to the next line)?



Thanks!

J.

CS4, Windows XP.