diff --git a/Tusker/Screens/Timeline/TimelinesPageViewController.swift b/Tusker/Screens/Timeline/TimelinesPageViewController.swift
index 3aafae5f..0cb4298a 100644
--- a/Tusker/Screens/Timeline/TimelinesPageViewController.swift
+++ b/Tusker/Screens/Timeline/TimelinesPageViewController.swift
@@ -83,7 +83,8 @@ class TimelinesPageViewController: SegmentedPageViewController<TimelinesPageView
             return
         }
         selectPage(page, animated: false)
-        let timelineVC = pageControllers[currentIndex] as! TimelineViewController
+        // can't use currentIndex here because the view isn't loaded yet, and so the page wasn't actually updated by the selectPage call
+        let timelineVC = pageControllers[pages.firstIndex(of: page)!] as! TimelineViewController
         timelineVC.restoreActivity(activity)
     }
     
diff --git a/Tusker/Screens/Utilities/SegmentedPageViewController.swift b/Tusker/Screens/Utilities/SegmentedPageViewController.swift
index f548d964..d55319e5 100644
--- a/Tusker/Screens/Utilities/SegmentedPageViewController.swift
+++ b/Tusker/Screens/Utilities/SegmentedPageViewController.swift
@@ -42,7 +42,7 @@ class SegmentedPageViewController<Page: Hashable>: UIPageViewController, UIPageV
                 self.selectPage(option, animated: true)
             }
         }
-        // TODO: double check this with the custom segmented control
+        // TODO: the custom segmented control isn't treated as a group and I have no idea how to change that
         // the segemented control itself is only focusable when VoiceOver is in Group navigation mode,
         // so make it clear that to switch tabs the user needs to enter the group
         segmentedControl.accessibilityHint = "Enter group to select timeline"