Very quick and dirty hack to improve tabbing behauviour