fixes #3037

Small, annoying issue fixed. Also added convenience method to get the selected option.

Initial pull was against the wrong branch.