diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/model/course/CourseComponent.java b/OpenEdXMobile/src/main/java/org/edx/mobile/model/course/CourseComponent.java
index fb356c7ab3..d4fd70412b 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/model/course/CourseComponent.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/model/course/CourseComponent.java
@@ -607,7 +607,7 @@ public CourseComponent getFirstIncompleteComponent() {
             }
         }
         if (children.size() > 0) {
-            return children.get(children.size() - 1);
+            return children.get(0);
         } else {
             return null;
         }
@@ -622,7 +622,7 @@ public CourseComponent getFirstIncompleteVideoComponent() {
             }
         }
         if (videos.size() > 0) {
-            return videos.get(videos.size() - 1);
+            return videos.get(0);
         } else {
             return null;
         }