Fix resets for Navigation and Top bar

Closes #3560487

Merge request reports

Loading