diff --git a/examples/components/simpleviewer.js b/examples/components/simpleviewer.js
index 548881768..1934a5a6e 100644
--- a/examples/components/simpleviewer.js
+++ b/examples/components/simpleviewer.js
@@ -32,8 +32,14 @@ if (!PDFJS.PDFViewer || !PDFJS.getDocument) {
 
 var DEFAULT_URL = '../../web/compressed.tracemonkey-pldi-09.pdf';
 
+var container = document.getElementById('viewerContainer');
 var pdfViewer = new PDFJS.PDFViewer({
-  container: document.getElementById('viewerContainer')
+  container: container
+});
+
+container.addEventListener('pagesinit', function () {
+  // we can use pdfViewer now, e.g. let's change default scale.
+  pdfViewer.currentScaleValue = 'page-width';
 });
 
 // Loading document.
diff --git a/web/pdf_viewer.js b/web/pdf_viewer.js
index f5dd910c3..02304d01c 100644
--- a/web/pdf_viewer.js
+++ b/web/pdf_viewer.js
@@ -270,8 +270,12 @@ var PDFViewer = (function pdfViewer() {
           }
         });
 
+        var event = document.createEvent('CustomEvent');
+        event.initCustomEvent('pagesinit', true, true, null);
+        self.container.dispatchEvent(event);
+
         if (this.defaultRenderingQueue) {
-          firstPagePromise.then(this.update.bind(this));
+          this.update();
         }
       }.bind(this));
     },