diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
index bec5c0ca0..8b2a81f3d 100644
--- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
+++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
@@ -175,12 +175,6 @@ TrackInfoWidget::jumpToCurrentTrack()
 void
 TrackInfoWidget::load( const query_ptr& query )
 {
-    m_query = query;
-    m_artist = Artist::get( m_query->track()->artist() );
-    m_title = QString( "%1 - %2" ).arg( query->track()->artist() ).arg( query->track()->track() );
-    ui->trackLabel->setText( m_query->track()->track() );
-    ui->artistLabel->setArtist( m_query->track()->artistPtr() );
-
     if ( !m_query.isNull() )
     {
         disconnect( m_query->track().data(), SIGNAL( lyricsLoaded() ), this, SLOT( onLyricsLoaded() ) );
@@ -191,6 +185,12 @@ TrackInfoWidget::load( const query_ptr& query )
         disconnect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), this, SLOT( onSimilarArtistsLoaded() ) );
     }
 
+    m_query = query;
+    m_artist = Artist::get( m_query->track()->artist() );
+    m_title = QString( "%1 - %2" ).arg( query->track()->artist() ).arg( query->track()->track() );
+    ui->trackLabel->setText( m_query->track()->track() );
+    ui->artistLabel->setArtist( m_query->track()->artistPtr() );
+
     connect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), SLOT( onSimilarArtistsLoaded() ) );
     connect( m_artist.data(), SIGNAL( statsLoaded() ), SLOT( onStatsLoaded() ) );
     connect( m_query->track().data(), SIGNAL( lyricsLoaded() ), SLOT( onLyricsLoaded() ) );