Fixed overlapping window issue