Fix for selected item in top header bar