Fix regression bug #21 found by @genhoi
Merge branch 'fix-tab-selecting'