diff --git a/src/js/components/Track.js b/src/js/components/Track.js
index 4088da55..253b1f31 100755
--- a/src/js/components/Track.js
+++ b/src/js/components/Track.js
@@ -391,7 +391,7 @@ export default class Track extends React.Component {
           <div className="list__item__column list__item__column--right">
             {drag_zone}
             {track.is_explicit && <span className="flag flag--dark">EXPLICIT</span>}
-            {track_context === 'album' && track.track_number && (
+            {(track_context === 'album' || track_context === 'artist') && track.track_number && (
               <span className="mid_grey-text list__item__column__item list__item__column__item--track-number">
                 <span>
                   <I18n path="track.title" />
diff --git a/src/js/locale/en.yaml b/src/js/locale/en.yaml
index 51047181..2b53d1f7 100755
--- a/src/js/locale/en.yaml
+++ b/src/js/locale/en.yaml
@@ -251,6 +251,10 @@ artist:
       more: All related artists
   tracks:
     title: Tracks
+    sort:
+      disc_track: Track number
+      name: Name
+      album: Album
   related_artists:
     title: Related artists
   about:
diff --git a/src/js/views/Artist.js b/src/js/views/Artist.js
index ab777971..972eca36 100755
--- a/src/js/views/Artist.js
+++ b/src/js/views/Artist.js
@@ -322,12 +322,12 @@ class Artist extends React.Component {
 
     const sort_options = [
       {
-        value: 'disc_track',
-        label: i18n('album.tracks.sort.disc_track'),
+        value: 'name',
+        label: i18n('artist.tracks.sort.name'),
       },
       {
-        value: 'name',
-        label: i18n('album.tracks.sort.name'),
+        value: 'album',
+        label: i18n('artist.tracks.sort.album'),
       },
     ];
 
@@ -357,6 +357,7 @@ class Artist extends React.Component {
             className="artist-track-list"
             uri={uri}
             tracks={tracks}
+            track_context="artist"
           />
         </section>
       </div>