diff --git a/toolkit/content/widgets/wizard.xml b/toolkit/content/widgets/wizard.xml
index 2d8ae0dea4ba..cad5a6150d64 100644
--- a/toolkit/content/widgets/wizard.xml
+++ b/toolkit/content/widgets/wizard.xml
@@ -110,7 +110,7 @@
         <setter>
         <![CDATA[
           if (val < 0 || val >= this.pageCount)
-            return;
+            return val;
 
           var page = this.wizardPages[val];
           this._pageStack[this._pageStack.length-1] = page;
diff --git a/xpfe/global/resources/content/bindings/wizard.xml b/xpfe/global/resources/content/bindings/wizard.xml
index 6eea6fba9ad2..e29099a02b86 100644
--- a/xpfe/global/resources/content/bindings/wizard.xml
+++ b/xpfe/global/resources/content/bindings/wizard.xml
@@ -95,7 +95,7 @@
         <setter>
         <![CDATA[
           if (val < 0 || val >= this.pageCount)
-            return;
+            return val;
 
           var page = this.wizardPages[val];
           this._pageStack[this._pageStack.length-1] = page;