fix #4229: selection mode in lists stays on
Merge branch 'issue-4229' into upstream