Currently the spec has both of these go through the same algorithm: https://html.spec.whatwg.org/#stop-document-loading
They need to be separated, and we should also write tests to capture the fact that history.back(); window.stop() still navigates back.