Trace: Fixed a doxygen comment
Use a generic approach when adding the "close on enter" hook for popups