diff --git a/public/templates/admin/classifier.html b/public/templates/admin/classifier.html
index 5f55f3ac..620e4e0a 100644
--- a/public/templates/admin/classifier.html
+++ b/public/templates/admin/classifier.html
@@ -1,4 +1,4 @@
 <div class="classifier">
-    <pfm-paged-tracks-list type="all" click-override="clickOverride(id)" class="classifier-track-list"></pfm-paged-tracks-list>
+    <pfm-paged-tracks-list type="all" click-override="clickOverride(id)" has-override="true" class="classifier-track-list"></pfm-paged-tracks-list>
     <pfm-track-editor track-id="trackIdToEdit" class="classifier-track-editor"></pfm-track-editor>
 </div>
diff --git a/public/templates/directives/paged-tracks-list.html b/public/templates/directives/paged-tracks-list.html
index d82d629b..b9dbce61 100644
--- a/public/templates/directives/paged-tracks-list.html
+++ b/public/templates/directives/paged-tracks-list.html
@@ -17,6 +17,7 @@
     </div>
 
     <div class="stretch-to-bottom">
-        <pfm-tracks-list tracks="tracks" class="three-columns" click-override="newClickOverride(id)"></pfm-tracks-list>
+        <pfm-tracks-list ng-if="hasOverride" tracks="tracks" class="three-columns" click-override="newClickOverride(id)" has-override="true"></pfm-tracks-list>
+        <pfm-tracks-list ng-if="!hasOverride" tracks="tracks" class="three-columns"></pfm-tracks-list>
     </div>
 </div>
diff --git a/public/templates/directives/tracks-list.html b/public/templates/directives/tracks-list.html
index beaa1cd6..28aca3a8 100644
--- a/public/templates/directives/tracks-list.html
+++ b/public/templates/directives/tracks-list.html
@@ -16,7 +16,7 @@
                 <i class="fa fa-trash"></i>
             </a>
         </div>
-        <a class="info" ng-href="{{::track.url}}" ng-if="!clickOverride">
+        <a class="info" ng-href="{{::track.url}}" ng-if="!hasOverride">
             <span class="title">{{::track.title}}</span>
             <span class="stats" title="{{::track.stats.favourites}} Favourites / {{:: track.stats.comments}} Comments / {{::track.stats.plays}} Plays">
                 <strong>{{::track.stats.favourites}}</strong>f
@@ -25,7 +25,7 @@
             </span>
             <span class="artist">{{::track.user.name}} / {{::track.genre.name}}</span>
         </a>
-        <a class="info" ng-if="clickOverride" href="#" ng-click="clickOverride({id: track.id})">
+        <a class="info" ng-if="hasOverride" href="#" ng-click="clickOverride({id: track.id})">
             <span class="title">{{::track.title}}</span>
             <span class="stats" title="{{::track.stats.favourites}} Favourites / {{:: track.stats.comments}} Comments / {{::track.stats.plays}} Plays">
                 <strong>{{::track.stats.favourites}}</strong>f
diff --git a/resources/assets/scripts/app/directives/paged-tracks-list.coffee b/resources/assets/scripts/app/directives/paged-tracks-list.coffee
index 3aa47485..2b9f319c 100644
--- a/resources/assets/scripts/app/directives/paged-tracks-list.coffee
+++ b/resources/assets/scripts/app/directives/paged-tracks-list.coffee
@@ -22,6 +22,7 @@ module.exports = angular.module('ponyfm').directive 'pfmPagedTracksList', () ->
         type: '@'
         class: '@class'
         clickOverride: '&'
+        hasOverride: '@'
 
     controller: [
         '$scope', 'tracks', '$state', '$location'
diff --git a/resources/assets/scripts/app/directives/tracks-list.coffee b/resources/assets/scripts/app/directives/tracks-list.coffee
index a2d49ddc..5b8f3855 100644
--- a/resources/assets/scripts/app/directives/tracks-list.coffee
+++ b/resources/assets/scripts/app/directives/tracks-list.coffee
@@ -23,6 +23,7 @@ module.exports = angular.module('ponyfm').directive 'pfmTracksList', () ->
         tracks: '=tracks'
         class: '@class'
         clickOverride: '&'
+        hasOverride: '@'
 
     controller: [
         '$modal', '$scope', 'favourites', 'player', 'playlists', 'auth'