PLF-5463: Weird behavior on Top Navigation Bar

Fix description:
	- Revert PLF-5315 and PLF-4862