Fix some UX regression
Merge branch 'fix/listener'