diff --git a/Source/CoursesContainerViewController.swift b/Source/CoursesContainerViewController.swift
index 8ae216a04..8636da4c6 100644
--- a/Source/CoursesContainerViewController.swift
+++ b/Source/CoursesContainerViewController.swift
@@ -201,6 +201,7 @@ class CoursesContainerViewController: UICollectionViewController {
             let footerView = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: EnrolledCoursesFooterView.identifier, for: indexPath) as! EnrolledCoursesFooterView
             footerView.findCoursesAction = {[weak self] in
                 self?.environment.router?.showCourseCatalog(fromController: self, bottomBar: nil)
+                self?.environment.analytics.trackUserFindsCourses(self?.courses.count ?? 0)
             }
             return footerView
         }
diff --git a/Source/EnrolledTabBarViewController.swift b/Source/EnrolledTabBarViewController.swift
index fc5098f14..9a0fea82e 100644
--- a/Source/EnrolledTabBarViewController.swift
+++ b/Source/EnrolledTabBarViewController.swift
@@ -169,8 +169,5 @@ class EnrolledTabBarViewController: UITabBarController, UITabBarControllerDelega
 extension EnrolledTabBarViewController {
     func tabBarController(_ tabBarController: UITabBarController, didSelect viewController: UIViewController){
         navigationItem.title = viewController.navigationItem.title
-        if TabBarOptions.options[tabBarController.selectedIndex] == .CourseCatalog {
-            environment.analytics.trackUserFindsCourses()
-        }
     }
 }
diff --git a/Source/OEXAnalytics.h b/Source/OEXAnalytics.h
index d203d30fb..913b77f1b 100644
--- a/Source/OEXAnalytics.h
+++ b/Source/OEXAnalytics.h
@@ -132,7 +132,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)trackUserDoesNotHaveAccount;
 
-- (void)trackUserFindsCourses;
+- (void)trackUserFindsCourses:(NSInteger) enrolledCounses;
 
 //Discussion search screen event
 - (void) trackDiscussionSearchScreenWithName:(NSString *) screenName courseId:(NSString *) courseID value:(nullable NSString *) value searchQuery:(NSString *) query;
diff --git a/Source/OEXAnalytics.m b/Source/OEXAnalytics.m
index dee3d380a..fdaeed96b 100644
--- a/Source/OEXAnalytics.m
+++ b/Source/OEXAnalytics.m
@@ -482,13 +482,13 @@ - (void)trackUserDoesNotHaveAccount {
     [self trackEvent:event forComponent:nil withInfo:@{}];
 }
 
-- (void)trackUserFindsCourses {
+- (void)trackUserFindsCourses:(NSInteger) enrolledCounses {
     OEXAnalyticsEvent* event = [[OEXAnalyticsEvent alloc] init];
     event.name = value_find_courses;
     event.displayName = @"Find Courses Clicked";
     event.category = OEXAnalyticsCategoryUserEngagement;
     event.label = @"course-discovery";
-    [self trackEvent:event forComponent:nil withInfo:@{}];
+    [self trackEvent:event forComponent:nil withInfo:@{@"enrolled_courses_count": [NSNumber numberWithInteger:enrolledCounses]}];
 }
 
 #pragma mark- Discussion
diff --git a/Source/OEXRouter+Swift.swift b/Source/OEXRouter+Swift.swift
index d14e2c964..5a0b43fc3 100644
--- a/Source/OEXRouter+Swift.swift
+++ b/Source/OEXRouter+Swift.swift
@@ -492,7 +492,6 @@ extension OEXRouter {
         } else {
             showControllerFromStartupScreen(controller: controller)
         }
-        self.environment.analytics.trackUserFindsCourses()
     }
     
     func discoveryViewController(bottomBar: UIView? = nil, searchQuery: String? = nil) -> UIViewController? {