ensure we stay in overlay when navigating (link or form)
Merge pull request #802 from xi/feature-571-ensure-overlay

ensure we stay in overlay when navigating (link or form)