Revert "Fixed focus state in navigation"

This reverts commit 26a6ba33f6fa2a4ebad3d750f19d56f948c6d54a.