diff --git a/MyTracks/src/com/google/android/apps/mytracks/SearchActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SearchActivity.java
index d2e1eb15e..8db8453c6 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/SearchActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/SearchActivity.java
@@ -199,6 +199,10 @@ public class SearchActivity extends ListActivity {
     @SuppressWarnings("unchecked")
     Map<String, Object> clickedData = (Map<String, Object>) getListAdapter().getItem(position);
 
+    startActivity(createViewDataIntent(clickedData));
+  }
+
+  private Intent createViewDataIntent(Map<String, Object> clickedData) {
     Intent intent = new Intent(Intent.ACTION_VIEW);
     if (clickedData.containsKey("waypointId")) {
       long waypointId = (Long) clickedData.get("waypointId");
@@ -209,6 +213,6 @@ public class SearchActivity extends ListActivity {
       Uri uri = ContentUris.withAppendedId(TracksColumns.CONTENT_URI, trackId);
       intent.setDataAndType(uri, TracksColumns.CONTENT_ITEMTYPE);
     }
-    startActivity(intent);
+    return intent;
   }
 }