Issue 6950: 	The navigation buttons are buggy