diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp
index 626aa3ab2..b32e7fdda 100644
--- a/src/libtomahawk/ViewManager.cpp
+++ b/src/libtomahawk/ViewManager.cpp
@@ -140,10 +140,11 @@ ViewManager::createPageForPlaylist( const playlist_ptr& playlist )
     view->setDetailedView( pv );
     view->setPixmap( pv->pixmap() );
 
-    model->loadPlaylist( playlist );
+    // We need to set the model on the view before loading the playlist, so spinners & co are connected
     view->setPlayableModel( model );
     pv->setPlaylistModel( model );
 
+    model->loadPlaylist( playlist );
     playlist->resolve();
 
     return view;
diff --git a/src/libtomahawk/playlist/PlaylistModel.cpp b/src/libtomahawk/playlist/PlaylistModel.cpp
index 86f480a89..ac54cc61a 100644
--- a/src/libtomahawk/playlist/PlaylistModel.cpp
+++ b/src/libtomahawk/playlist/PlaylistModel.cpp
@@ -280,10 +280,11 @@ PlaylistModel::insertEntries( const QList< Tomahawk::plentry_ptr >& entries, int
         Pipeline::instance()->resolve( queries );
         emit loadingStarted();
     }
+    else
+        finishLoading();
 
     emit endInsertRows();
     emit trackCountChanged( rowCount( QModelIndex() ) );
-    finishLoading();
 }