Fix Back and Forward navigation

Authored by kezik on Jan 11 2020, 7:58 AM.