diff --git a/app/views/users/omniauth_callbacks/complete.html.erb b/app/views/users/omniauth_callbacks/complete.html.erb
index 310726853..86c1c3f13 100644
--- a/app/views/users/omniauth_callbacks/complete.html.erb
+++ b/app/views/users/omniauth_callbacks/complete.html.erb
@@ -22,8 +22,12 @@
     <p><%=t "login.close_window" %></p>
 
     <script type="text/javascript">
-      window.opener.Discourse.authenticationComplete(<%=@auth_result.to_client_hash.to_json.html_safe%>);
-      window.close();
+      if(window.opener) {
+        window.opener.Discourse.authenticationComplete(<%=@auth_result.to_client_hash.to_json.html_safe%>);
+        window.close();
+      } else {
+        window.location = '<%= Discourse.base_uri("/") %>';
+      }
     </script>
   </div>
 </body>