Fixes beastly accessibility bug we had! (closes #2290)

@jbau - Here's the crazy PR...