diff --git a/dev-helpers/oauth2-redirect.html b/dev-helpers/oauth2-redirect.html
index fb68399d..f4aaa93b 100644
--- a/dev-helpers/oauth2-redirect.html
+++ b/dev-helpers/oauth2-redirect.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <html lang="en-US">
-<body onload="run()">
+<body>
 </body>
 </html>
 <script>
@@ -64,4 +64,8 @@
         }
         window.close();
     }
+
+    window.addEventListener('DOMContentLoaded', function () {
+      run();
+    });
 </script>
diff --git a/dist/oauth2-redirect.html b/dist/oauth2-redirect.html
index a013fc82..d04e1ba6 100644
--- a/dist/oauth2-redirect.html
+++ b/dist/oauth2-redirect.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html lang="en-US">
 <title>Swagger UI: OAuth2 Redirect</title>
-<body onload="run()">
+<body>
 </body>
 </html>
 <script>
@@ -65,4 +65,8 @@
         }
         window.close();
     }
+
+    window.addEventListener('DOMContentLoaded', function () {
+      run();
+    });
 </script>
