Cherry-pick fix for tab order (bnc#872341)

I wanted to commit the fix to SLE-12-GA first, but I did a mistake and committed it to master. Cherry-picking to fix it before both branches diverge.