Added window tab handler