fix selector menu
Merge branch 'dev' into smbtc

* dev:
  fix selector menu