diff --git a/toolkit/content/widgets/wizard.xml b/toolkit/content/widgets/wizard.xml
index 2900a3da35a..d34270998c4 100644
--- a/toolkit/content/widgets/wizard.xml
+++ b/toolkit/content/widgets/wizard.xml
@@ -104,15 +104,17 @@
         </setter>
       </property>
 
-      <property name="pageIndex" onget="return this._pageIndex;">
+      <property name="pageIndex" onget="return this._currentPage.pageIndex;">
         <setter>
         <![CDATA[
           if (val < 0 || val >= this.pageCount)
-            return this._pageIndex;
+            return;
 
           var page = this.wizardPages[val];
           this._pageStack[this._pageStack.length-1] = page;
           this.currentPage = page;
+
+          return val;
         ]]>
         </setter>
       </property>
diff --git a/xpfe/global/resources/content/bindings/wizard.xml b/xpfe/global/resources/content/bindings/wizard.xml
index c0ee6464811..d71ef04f97f 100644
--- a/xpfe/global/resources/content/bindings/wizard.xml
+++ b/xpfe/global/resources/content/bindings/wizard.xml
@@ -91,15 +91,17 @@
         </setter>
       </property>
 
-      <property name="pageIndex" onget="return this._pageIndex;">
+      <property name="pageIndex" onget="return this._currentPage.pageIndex;">
         <setter>
         <![CDATA[
           if (val < 0 || val >= this.pageCount)
-            return this._pageIndex;
+            return;
 
           var page = this.wizardPages[val];
           this._pageStack[this._pageStack.length-1] = page;
           this.currentPage = page;
+
+          return val;
         ]]>
         </setter>
       </property>