diff --git a/app/Http/Controllers/Api/Web/TracksController.php b/app/Http/Controllers/Api/Web/TracksController.php
index ba6d36df..391b7bfe 100644
--- a/app/Http/Controllers/Api/Web/TracksController.php
+++ b/app/Http/Controllers/Api/Web/TracksController.php
@@ -357,6 +357,11 @@ class TracksController extends ApiControllerBase
             $query->whereIn('show_song_track.show_song_id', Request::get('songs'));
         }
 
+        if (Request::has('archive')) {
+            // Select which archive to view
+            $query->where('source', Request::get('archive'));
+        }
+
         return $query;
     }
 }
diff --git a/public/templates/tracks/index.html b/public/templates/tracks/index.html
index f14e53ec..6a66f955 100644
--- a/public/templates/tracks/index.html
+++ b/public/templates/tracks/index.html
@@ -63,6 +63,17 @@
             </li>
         </ul>
     </li>
+    <li class="dropdown" ng-class="{'has-filter': !query.filters.archive.isDefault}">
+        <a class="dropdown-toggle btn btn-default" bs-dropdown>
+            Archive: <strong>{{query.filters.archive.title}}</strong>
+        </a>
+        <a class="btn btn-default" pfm-eat-click ng-click="clearFilter('archive')"><i class="fa fa-remove"></i></a>
+        <ul class="dropdown-menu">
+            <li ng-repeat="filter in ::filters.archive.values track by $index" ng-class="{selected: filter == query.filters.archive}">
+                <a pfm-eat-click href="#" ng-click="setFilter('archive', filter)">{{::filter.title}}</a>
+            </li>
+        </ul>
+    </li>
 </ul>
 
 <div class="pagination" ng-if="totalPages > 1">
diff --git a/resources/assets/scripts/app/services/tracks.coffee b/resources/assets/scripts/app/services/tracks.coffee
index 9b9f05a7..84e94a06 100644
--- a/resources/assets/scripts/app/services/tracks.coffee
+++ b/resources/assets/scripts/app/services/tracks.coffee
@@ -238,6 +238,15 @@ module.exports = angular.module('ponyfm').factory('tracks', [
                     name: 'songs'
                     values: []
                     filterName: 'songs'
+                
+                self.filters.archive =
+                    type: 'single'
+                    name: 'archive'
+                    values: [
+                        {title: 'None', query: '', isDefault: true, filter: ''}
+                        {title: 'MLP Music Archive', query: 'mlpma', isDefault: false, filter: 'archive=mlpma'}
+                        {title: 'Ponify', query: 'ponify', isDefault: false, filter: 'archive=ponify'}
+                    ]
 
                 taxonomies.refresh().done (taxes) ->
                     for genre in taxes.genresWithTracks