MAP-933: Resolve problems with dirty page and errant return to dashboard.