diff --git a/Microsoft.Phone.Controls.Toolkit/BasePage/BasePage.cs b/Microsoft.Phone.Controls.Toolkit/BasePage/BasePage.cs
index 2b23d85..ab252f7 100644
--- a/Microsoft.Phone.Controls.Toolkit/BasePage/BasePage.cs
+++ b/Microsoft.Phone.Controls.Toolkit/BasePage/BasePage.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Navigation;
 
 namespace Microsoft.Phone.Controls
 {
@@ -21,41 +22,30 @@ public class BasePage : PhoneApplicationPage
         /// </summary>
         public BasePage()
         {
-            // When this page is part of the visual tree make the following changes:
-            // 1) Map orientation to visual state for the page
-            Loaded += (sender, e) =>
-            {
-                StartLayoutUpdates(sender, e);
-            };
+        }
 
-            // Undo the same changes when the page is no longer visible
-            Unloaded += (sender, e) =>
+        /// <summary>
+        /// Called when a page becomes the active page in a frame.
+        /// </summary>
+        /// <param name="e">An object that contains the event data.</param>
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            base.OnNavigatedTo(e);
+
+            if (_layoutAwareControls == null)
             {
-                StopLayoutUpdates(sender, e);
-            };
+                StartLayoutUpdates(this);
+            }
         }
 
         #region Visual state switching
 
         /// <summary>
-        /// Invoked as an event handler, typically on the <see cref="FrameworkElement.Loaded"/>
-        /// event of a <see cref="Control"/> within the page, to indicate that the sender should
-        /// start receiving visual state management changes that correspond to orientation changes.
+        /// Start layout updates for the specified control.
         /// </summary>
-        /// <param name="sender">Instance of <see cref="Control"/> that supports visual state
-        /// management corresponding to orientations.</param>
-        /// <param name="e">Event data that describes how the request was made.</param>
-        /// <remarks>The current view state will immediately be used to set the corresponding
-        /// visual state when layout updates are requested.  A corresponding
-        /// <see cref="FrameworkElement.Unloaded"/> event handler connected to
-        /// <see cref="StopLayoutUpdates"/> is strongly encouraged.  Instances of
-        /// <see cref="BasePage"/> automatically invoke these handlers in their Loaded and
-        /// Unloaded events.</remarks>
-        /// <seealso cref="DetermineVisualState"/>
-        /// <seealso cref="InvalidateVisualState"/>
-        public void StartLayoutUpdates(object sender, RoutedEventArgs e)
+        /// <param name="control"></param>
+        public void StartLayoutUpdates(Control control)
         {
-            var control = sender as Control;
             if (control == null) return;
             if (_layoutAwareControls == null)
             {
@@ -75,19 +65,11 @@ private void OnOrientationChanged(object sender, OrientationChangedEventArgs e)
         }
 
         /// <summary>
-        /// Invoked as an event handler, typically on the <see cref="FrameworkElement.Unloaded"/>
-        /// event of a <see cref="Control"/>, to indicate that the sender should start receiving
-        /// visual state management changes that correspond to orientation changes.
+        /// Stop layout updates for the specified control.
         /// </summary>
-        /// <param name="sender">Instance of <see cref="Control"/> that supports visual state
-        /// management corresponding to orientations.</param>
-        /// <param name="e">Event data that describes how the request was made.</param>
-        /// <remarks>The current orientation will immediately be used to set the corresponding
-        /// visual state when layout updates are requested.</remarks>
-        /// <seealso cref="StartLayoutUpdates"/>
-        public void StopLayoutUpdates(object sender, RoutedEventArgs e)
+        /// <param name="control"></param>
+        public void StopLayoutUpdates(Control control)
         {
-            var control = sender as Control;
             if (control == null || _layoutAwareControls == null) return;
             _layoutAwareControls.Remove(control);
             if (_layoutAwareControls.Count == 0)
diff --git a/Microsoft.Phone.Controls.Toolkit/PageUI/PageUI.cs b/Microsoft.Phone.Controls.Toolkit/PageUI/PageUI.cs
index 209b09e..9170b82 100644
--- a/Microsoft.Phone.Controls.Toolkit/PageUI/PageUI.cs
+++ b/Microsoft.Phone.Controls.Toolkit/PageUI/PageUI.cs
@@ -18,9 +18,6 @@ public class PageUI : ContentControl
         public PageUI()
         {
             DefaultStyleKey = typeof(PageUI);
-
-            Loaded += OnLoaded;
-            Unloaded += OnUnloaded;
         }
 
         #region Title
@@ -188,22 +185,16 @@ public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
 
-            _parentPage = this.GetParentByType<BasePage>();
-        }
-
-        private void OnLoaded(object sender, RoutedEventArgs e)
-        {
             if (_parentPage != null)
             {
-                _parentPage.StartLayoutUpdates(this, e);
+                _parentPage.StopLayoutUpdates(this);
             }
-        }
 
-        private void OnUnloaded(object sender, RoutedEventArgs e)
-        {
+            _parentPage = this.GetParentByType<BasePage>();
+
             if (_parentPage != null)
             {
-                _parentPage.StopLayoutUpdates(sender, e);
+                _parentPage.StartLayoutUpdates(this);
             }
         }
     }