diff --git a/frontend/src/TrackFile/Editor/TrackFileEditorModalContentConnector.js b/frontend/src/TrackFile/Editor/TrackFileEditorModalContentConnector.js
index c2e75d5cc5..71bb1a4f47 100644
--- a/frontend/src/TrackFile/Editor/TrackFileEditorModalContentConnector.js
+++ b/frontend/src/TrackFile/Editor/TrackFileEditorModalContentConnector.js
@@ -59,7 +59,7 @@ function createMapStateToProps() {
         return _.some(trackFiles.items, { id: track.trackFileId });
       });
 
-      const sorted = _.orderBy(filtered, ['albumId', 'absoluteTrackNumber'], ['desc', 'asc']);
+      const sorted = _.orderBy(filtered, ['albumId', 'mediumNumber', 'absoluteTrackNumber'], ['desc', 'asc', 'asc']);
 
       const items = _.map(sorted, (track) => {
         const trackFile = _.find(trackFiles.items, { id: track.trackFileId });