diff --git a/Loop/View Controllers/BolusViewController.swift b/Loop/View Controllers/BolusViewController.swift
index 6e5176d2a7..33807fdf33 100644
--- a/Loop/View Controllers/BolusViewController.swift	
+++ b/Loop/View Controllers/BolusViewController.swift	
@@ -69,10 +69,6 @@ class BolusViewController: UITableViewController, IdentifiableClass, UITextField
         }
     }
 
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
-        super.prepareForSegue(segue, sender: sender)
-    }
-
     private lazy var decimalFormatter: NSNumberFormatter = {
         let numberFormatter = NSNumberFormatter()
 
diff --git a/Loop/View Controllers/StatusTableViewController.swift b/Loop/View Controllers/StatusTableViewController.swift
index 67c45d2679..1ed34c7ea1 100644
--- a/Loop/View Controllers/StatusTableViewController.swift	
+++ b/Loop/View Controllers/StatusTableViewController.swift	
@@ -624,7 +624,11 @@ class StatusTableViewController: UITableViewController, UIGestureRecognizerDeleg
     override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
         super.prepareForSegue(segue, sender: sender)
 
-        switch segue.destinationViewController {
+        guard let navVC = segue.destinationViewController as? UINavigationController else {
+            return
+        }
+
+        switch navVC.topViewController {
         case let vc as CarbEntryTableViewController:
             vc.carbStore = dataManager.carbStore
             vc.hidesBottomBarWhenPushed = true