Remove conflict from window change with tab change