diff --git a/src/js/components/Sidebar.js b/src/js/components/Sidebar.js
index 947bf227..ad305c7c 100755
--- a/src/js/components/Sidebar.js
+++ b/src/js/components/Sidebar.js
@@ -76,6 +76,10 @@ class Sidebar extends React.Component{
 								<Icon name="cd" />
 								Albums
 							</Link>
+							<Link className={this.linkClassName('library/tracks')} to={global.baseURL+"library/tracks"}>
+								<Icon name="cd" />
+								Tracks
+							</Link>
 							<Link className={this.linkClassName('library/browse')} to={global.baseURL+"library/browse"}>
 								<Icon name="folder" />
 								Browse
diff --git a/src/js/services/spotify/reducer.js b/src/js/services/spotify/reducer.js
index 25f02494..f3e5ea87 100755
--- a/src/js/services/spotify/reducer.js
+++ b/src/js/services/spotify/reducer.js
@@ -174,6 +174,31 @@ export default function reducer(spotify = {}, action){
             }
             return Object.assign({}, spotify, { library_albums: uris })
 
+        case 'SPOTIFY_LIBRARY_TRACKS_LOADED':
+        case 'SPOTIFY_LIBRARY_TRACKS_LOADED_MORE':
+            var tracks = action.data.items
+
+            if (tracks){
+                for (var i = 0; i < tracks.length; i++){
+                    var track = Object.assign(
+                        {},
+                        tracks[i].track,
+                        {
+                            added_at: tracks[i].added_at
+                        }
+                    )
+                    tracks[i] = track
+                }
+                if (spotify.library_tracks){
+                    tracks = [...spotify.library_tracks,...tracks]
+                }
+            }
+
+            return Object.assign({}, spotify, { 
+                library_tracks: tracks, 
+                library_tracks_more: action.data.next
+            })
+
 
         case 'SPOTIFY_LIBRARY_PLAYLISTS_CLEAR':
             return Object.assign({}, spotify, { library_playlists: [] })
diff --git a/src/js/views/library/LibraryTracks.js b/src/js/views/library/LibraryTracks.js
index 4f399d3c..21098304 100755
--- a/src/js/views/library/LibraryTracks.js
+++ b/src/js/views/library/LibraryTracks.js
@@ -44,7 +44,7 @@ class LibraryTracks extends React.Component{
 				<Header icon="music" title="My tracks" />
 				<section className="content-wrapper">
 					{ this.props.tracks ? <TrackList tracks={this.props.tracks} /> : null }
-					<LazyLoadListener enabled={this.props.tracks_more} loadMore={ () => this.loadMore() }/>
+					<LazyLoadListener loading={this.props.tracks_more} loadMore={() => this.loadMore()}/>
 				</section>
 			</div>
 		);