diff --git a/extension/content/firebug/debugger/breakpoints/breakpointTool.js b/extension/content/firebug/debugger/breakpoints/breakpointTool.js
index 902810c523..1fff41928e 100644
--- a/extension/content/firebug/debugger/breakpoints/breakpointTool.js
+++ b/extension/content/firebug/debugger/breakpoints/breakpointTool.js
@@ -407,18 +407,6 @@ BreakpointTool.prototype = Obj.extend(new Tool(),
             }
         }
 
-        // If the previous async-process hasn't finished yet, put arguments in a queue.
-        if (this.setBreakpointInProgress)
-        {
-            Trace.sysout("breakpointTool.setBreakpoint; Setting BP in progress, wait " +
-                 url + " (" + lineNumber + ")");
-
-            this.queue.push(arguments);
-            return;
-        }
-
-        this.setBreakpointInProgress = true;
-
         // If the debuggee is paused, just set the breakpoint.
         if (thread.paused)
         {
@@ -435,6 +423,18 @@ BreakpointTool.prototype = Obj.extend(new Tool(),
             return;
         }
 
+        // If the previous async-process hasn't finished yet, put arguments in a queue.
+        if (this.setBreakpointInProgress)
+        {
+            Trace.sysout("breakpointTool.setBreakpoint; Setting BP in progress, wait " +
+                 url + " (" + lineNumber + ")");
+
+            this.queue.push(arguments);
+            return;
+        }
+
+        this.setBreakpointInProgress = true;
+
         // Otherwise, force a pause in order to set the breakpoint.
         // xxxHonza: this sometimes generates 'alreadyPaused' packet, fix me.
         // Or maybe the interrupt call in setBreakpoints. You need a page with two