From ea4bec0c3c5d53c2cf0a1ba4bdf8b62f6a6120c7 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 13 Oct 2014 18:35:05 +0400
Subject: [PATCH] Call updateScrollPosition for the first time as well

---
 modules/behaviors/ImitateBrowserBehavior.js | 6 +++++-
 modules/mixins/ScrollContext.js             | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/behaviors/ImitateBrowserBehavior.js b/modules/behaviors/ImitateBrowserBehavior.js
index accaa562b4..2f8f3b286b 100644
--- a/modules/behaviors/ImitateBrowserBehavior.js
+++ b/modules/behaviors/ImitateBrowserBehavior.js
@@ -13,7 +13,11 @@ var ImitateBrowserBehavior = {
         window.scrollTo(0, 0);
         break;
       case LocationActions.POP:
-        window.scrollTo(position.x, position.y);
+        if (position) {
+          window.scrollTo(position.x, position.y);
+        } else {
+          window.scrollTo(0, 0);
+        }
         break;
     }
   }
diff --git a/modules/mixins/ScrollContext.js b/modules/mixins/ScrollContext.js
index 6096e1fcd8..3977081041 100644
--- a/modules/mixins/ScrollContext.js
+++ b/modules/mixins/ScrollContext.js
@@ -60,9 +60,9 @@ var ScrollContext = {
 
   updateScroll: function (path, actionType) {
     var behavior = this.getScrollBehavior();
-    var position = this.getScrollPosition(path);
+    var position = this.getScrollPosition(path) || null;
 
-    if (behavior && position)
+    if (behavior)
       behavior.updateScrollPosition(position, actionType);
   },