Merge "Add TestWatcher to log starting/finished messages"
diff --git a/src/main/resources/static/find-owners.js b/src/main/resources/static/find-owners.js
index c773aa9..db4ca99 100644
--- a/src/main/resources/static/find-owners.js
+++ b/src/main/resources/static/find-owners.js
@@ -597,4 +597,6 @@
   self.on('submitchange', onSubmit);
   // Clicks outside the pop up window should close the window.
   document.body.addEventListener('click', onClick);
+  // Leaving page should close the window.
+  window.addEventListener('popstate', hideFindOwnersPage);
 });