diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc
index 6fdd837a1c3ce6c297cc29179d0eac9d30907f70..bb664d1a854705c1b033be04145e37ff8bd46ce4 100644
--- a/src/MissionManager/MissionController.cc
+++ b/src/MissionManager/MissionController.cc
@@ -2341,13 +2341,15 @@ void MissionController::setCurrentPlanViewSeqNum(int sequenceNumber, bool force)
                 if (currentSeqNumber == sequenceNumber && _isROIBeginItem(simpleItem)) {
                     _isROIBeginCurrentItem = true;
                 }
+            }
 
-                if (simpleItem->specifiesCoordinate() && !simpleItem->isStandaloneCoordinate()) {
+            if (viIndex != 0) {
+                // Complex items are assumed to be fly through
+                if (!simpleItem || (simpleItem->specifiesCoordinate() && !simpleItem->isStandaloneCoordinate())) {
                     lastFlyThroughSeqNum = currentSeqNumber;
                 }
             }
 
-
             if (currentSeqNumber == sequenceNumber) {
                 pVI->setIsCurrentItem(true);
                 pVI->setHasCurrentChildItem(false);