Fix for navbar click resetting workspace