diff --git a/oauth3.browser.js b/oauth3.browser.js
index dfe1d84..dad2272 100644
--- a/oauth3.browser.js
+++ b/oauth3.browser.js
@@ -138,6 +138,9 @@
 
   , insertIframe: function (url, state, opts) {
       opts = opts || {};
+      if (opts.debug) {
+        opts.timeout = opts.timeout || 15 * 60 * 1000;
+      }
       var promise = new OAUTH3.PromiseA(function (resolve, reject) {
         var tok;
         var iframeDiv;
@@ -181,6 +184,9 @@
     }
 
   , openWindow: function (url, state, opts) {
+      if (opts.debug) {
+        opts.timeout = opts.timeout || 15 * 60 * 1000;
+      }
       var promise = new OAUTH3.PromiseA(function (resolve, reject) {
         var tok;