Improve compatibility with TabsInTitlebar module