diff --git a/src/libtomahawk/playlist/PlayableModel.cpp b/src/libtomahawk/playlist/PlayableModel.cpp
index 6d08d4708..0a12f8c1d 100644
--- a/src/libtomahawk/playlist/PlayableModel.cpp
+++ b/src/libtomahawk/playlist/PlayableModel.cpp
@@ -711,11 +711,10 @@ PlayableModel::insertInternal( const QList< T >& items, int row, const QList< To
 
     emit endInsertRows();
     emit itemCountChanged( rowCount( QModelIndex() ) );
+
+    emit selectRequest( index( 0, 0, parent ) );
     if ( parent.isValid() )
-    {
-        emit selectRequest( index( 0, 0, parent ) );
         emit expandRequest( parent );
-    }
 
     finishLoading();
 }
diff --git a/src/libtomahawk/playlist/PlayableProxyModel.cpp b/src/libtomahawk/playlist/PlayableProxyModel.cpp
index 33ee7f884..94bff68f3 100644
--- a/src/libtomahawk/playlist/PlayableProxyModel.cpp
+++ b/src/libtomahawk/playlist/PlayableProxyModel.cpp
@@ -117,7 +117,6 @@ PlayableProxyModel::setSourcePlayableModel( PlayableModel* sourceModel )
     }
 
     m_model = sourceModel;
-
     if ( m_model )
     {
         connect( m_model, SIGNAL( loadingStarted() ), SIGNAL( loadingStarted() ) );
diff --git a/src/libtomahawk/playlist/TreeModel.cpp b/src/libtomahawk/playlist/TreeModel.cpp
index 7f9426362..5ab6b69e1 100644
--- a/src/libtomahawk/playlist/TreeModel.cpp
+++ b/src/libtomahawk/playlist/TreeModel.cpp
@@ -375,6 +375,7 @@ TreeModel::onTracksAdded( const QList<Tomahawk::query_ptr>& tracks, const QModel
     }
 
     emit endInsertRows();
+    emit selectRequest( index( 0, 0, parent ) );
 }
 
 
diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
index 8dec95824..157091eca 100644
--- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
+++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
@@ -27,8 +27,6 @@
 #include "database/Database.h"
 #include "playlist/TreeModel.h"
 #include "playlist/PlayableModel.h"
-#include "playlist/AlbumItemDelegate.h"
-#include "playlist/GridItemDelegate.h"
 #include "Source.h"
 #include "MetaPlaylistInterface.h"
 #include "playlist/TrackView.h"