diff --git a/src/js/components/ContextMenu/ContextMenuItems.js b/src/js/components/ContextMenu/ContextMenuItems.js
index fde7d72d..aa8f002c 100644
--- a/src/js/components/ContextMenu/ContextMenuItems.js
+++ b/src/js/components/ContextMenu/ContextMenuItems.js
@@ -157,10 +157,10 @@ const ContextMenuItems = ({
           {provider === 'spotify' && <Library uri={item.uri} />}
           <Love item={item} />
           <Divider />
+          <GoTo type="track" uri={item.uri} />
           {provider === 'spotify' && (
             <>
               <Discover uris={[item.uri]} context={context} />
-              <GoTo type="track" uri={item.uri} />
               <Divider />
             </>
           )}
diff --git a/src/js/views/Track.js b/src/js/views/Track.js
index 08d10d0b..3ff391e0 100755
--- a/src/js/views/Track.js
+++ b/src/js/views/Track.js
@@ -71,13 +71,11 @@ const LyricsSelector = ({
 
 const LyricsContent = ({
   authorized,
-  loading,
   track: {
     lyrics,
     lyrics_path,
   } = {},
 }) => {
-  if (loading) return <Loader mini />;
   if (!lyrics && !authorized) {
     return (
       <p className="no-results">
@@ -109,7 +107,6 @@ const LyricsContent = ({
 };
 
 const Lyrics = ({
-  loading,
   authorized,
   track,
   getTrackLyrics,
@@ -117,7 +114,6 @@ const Lyrics = ({
   <>
     <h4>
       <I18n path="track.lyrics" />
-      {loading && <Loader loading mini />}
     </h4>
 
     <LyricsSelector
@@ -263,7 +259,13 @@ class Track extends React.Component {
         )}
 
         <div className="thumbnail-wrapper">
-          <Thumbnail size="large" canZoom images={track.images} type="album" />
+          <Thumbnail
+            size="large"
+            images={track.images}
+            type="album"
+            loading={loading || loadingLyrics}
+            canZoom
+          />
         </div>
 
         <div className="title">
@@ -327,7 +329,6 @@ class Track extends React.Component {
         </div>
 
         <Lyrics
-          loading={loadingLyrics}
           authorized={genius_authorized}
           getTrackLyrics={getTrackLyrics}
           track={track}