Properly fix 5740873ed6

Previous commit introduced new bug, background tabs didn't have close
buttons.