fix multiwindow navigation
fix multiwindow navigation. Another try