diff --git a/plugins/oauth_client/views/oauth_client_plugin_public/finish.html.erb b/plugins/oauth_client/views/oauth_client_plugin_public/finish.html.erb
index 1a8adf9..f534df0 100644
--- a/plugins/oauth_client/views/oauth_client_plugin_public/finish.html.erb
+++ b/plugins/oauth_client/views/oauth_client_plugin_public/finish.html.erb
@@ -1,7 +1,12 @@
 <script>
-  window.addEventListener("message", function(ev) {
-    if (ev.data.message === "requestOauthClientPluginResult") {
-      ev.source.postMessage({ message: "oauthClientPluginResult", logged_in: <%= logged_in? %>, private_token: '<%= private_token %>' }, "*");
+  function oauthPluginCloseLoginPopup(loggedIn, privateToken) {
+    if (window.opener && typeof window.opener.oauthPluginHandleLoginResult == 'function') {
+      try {
+        window.opener.oauthPluginHandleLoginResult(loggedIn, privateToken);
+      } catch (err) {}
+      window.close();
     }
-  });
+    return false;
+  }
+  oauthPluginCloseLoginPopup(<%= logged_in? %>, '<%= private_token %>');
 </script>
--
libgit2 0.21.2