Good catch moving this out of the context-menu drawing function so it doesn't register over and over. :-)