diff --git a/src/playlist/collectionflatmodel.cpp b/src/playlist/collectionflatmodel.cpp
index 21b1343f0..e936d9e2c 100644
--- a/src/playlist/collectionflatmodel.cpp
+++ b/src/playlist/collectionflatmodel.cpp
@@ -147,6 +147,8 @@ CollectionFlatModel::removeCollection( const collection_ptr& collection )
     }
 
 //    m_collectionIndex.remove( collection );
+
+    emit trackCountChanged( rowCount( QModelIndex() ) );
 }
 
 
diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp
index 8438db332..6b8b39389 100644
--- a/src/playlist/playlistmanager.cpp
+++ b/src/playlist/playlistmanager.cpp
@@ -340,11 +340,14 @@ PlaylistManager::showCurrentTrack()
 
     if ( m_views.contains( playlist ) )
     {
+        unlinkPlaylist();
+
         m_currentView = m_views.value( playlist );
         m_currentProxyModel = m_currentView->proxyModel();
         m_currentModel = m_currentView->model();
 
         m_widget->setCurrentWidget( m_currentView );
+        linkPlaylist();
     }
 
     if ( m_currentView && m_currentProxyModel )