Add back the no-highlight-while-disabled behavior
Forgot to check for enabled status