diff --git a/src/libtomahawk/context/pages/RelatedArtistsContext.cpp b/src/libtomahawk/context/pages/RelatedArtistsContext.cpp
index 4c79814a6..bb2d72ae1 100644
--- a/src/libtomahawk/context/pages/RelatedArtistsContext.cpp
+++ b/src/libtomahawk/context/pages/RelatedArtistsContext.cpp
@@ -36,9 +36,6 @@ RelatedArtistsContext::RelatedArtistsContext()
     m_relatedModel->setColumnStyle( TreeModel::TrackOnly );
     m_relatedView->setTreeModel( m_relatedModel );
     m_relatedView->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-    m_relatedView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-    m_relatedView->header()->setVisible( false );
-    m_relatedView->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
 
     QPalette pal = m_relatedView->palette();
     pal.setColor( QPalette::Window, QColor( 0, 0, 0, 0 ) );
diff --git a/src/libtomahawk/context/pages/TopTracksContext.cpp b/src/libtomahawk/context/pages/TopTracksContext.cpp
index 34d0e5dc2..f5d0638e9 100644
--- a/src/libtomahawk/context/pages/TopTracksContext.cpp
+++ b/src/libtomahawk/context/pages/TopTracksContext.cpp
@@ -36,8 +36,6 @@ TopTracksContext::TopTracksContext()
     m_topHitsModel->setStyle( TrackModel::Short );
     m_topHitsView->setPlaylistModel( m_topHitsModel );
     m_topHitsView->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-    m_topHitsView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-    m_topHitsView->setHeaderHidden( true );
 
     QPalette pal = m_topHitsView->palette();
     pal.setColor( QPalette::Window, QColor( 0, 0, 0, 0 ) );
diff --git a/src/libtomahawk/playlist/artistview.cpp b/src/libtomahawk/playlist/artistview.cpp
index ff1eb1960..74856d060 100644
--- a/src/libtomahawk/playlist/artistview.cpp
+++ b/src/libtomahawk/playlist/artistview.cpp
@@ -129,6 +129,17 @@ ArtistView::setTreeModel( TreeModel* model )
     connect( m_proxyModel, SIGNAL( rowsInserted( QModelIndex, int, int ) ), SLOT( onViewChanged() ) );
 
     setAcceptDrops( false );
+
+    if ( model->columnStyle() == TreeModel::TrackOnly )
+    {
+        setHeaderHidden( true );
+        setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+    }
+    else
+    {
+        setHeaderHidden( false );
+        setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );
+    }
 }
 
 
diff --git a/src/libtomahawk/playlist/trackview.cpp b/src/libtomahawk/playlist/trackview.cpp
index af3babf92..6f03d8545 100644
--- a/src/libtomahawk/playlist/trackview.cpp
+++ b/src/libtomahawk/playlist/trackview.cpp
@@ -142,7 +142,7 @@ TrackView::setTrackModel( TrackModel* model )
 
     setAcceptDrops( true );
 
-    if ( model->style() == TrackModel::Short )
+    if ( model->style() == TrackModel::Short || model->style() == TrackModel::ShortWithAvatars )
     {
         setHeaderHidden( true );
         setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
@@ -520,7 +520,7 @@ TrackView::mousePressEvent( QMouseEvent* event )
 {
     QTreeView::mousePressEvent( event );
 
-    if ( m_model->style() == TrackModel::Short || m_model->style() == TrackModel::ShortWithAvatars )
+    if ( m_model->style() != TrackModel::Detailed )
         return;
 
     QModelIndex idx = indexAt( event->pos() );
diff --git a/src/libtomahawk/playlist/treemodel.h b/src/libtomahawk/playlist/treemodel.h
index a02aa5cc2..153da19c8 100644
--- a/src/libtomahawk/playlist/treemodel.h
+++ b/src/libtomahawk/playlist/treemodel.h
@@ -91,6 +91,7 @@ public:
 
     void getCover( const QModelIndex& index );
 
+    ColumnStyle columnStyle() const { return m_columnStyle; }
     void setColumnStyle( ColumnStyle style );
 
     virtual QString title() const { return m_title; }
diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
index 64655cad7..1e0fb7890 100644
--- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
+++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
@@ -59,8 +59,6 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
     m_relatedModel = new TreeModel( ui->relatedArtists );
     m_relatedModel->setColumnStyle( TreeModel::TrackOnly );
     ui->relatedArtists->setTreeModel( m_relatedModel );
-    ui->relatedArtists->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-    ui->relatedArtists->header()->setVisible( false );
 
     m_topHitsModel = new PlaylistModel( ui->topHits );
     m_topHitsModel->setStyle( TrackModel::Short );
diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp
index c5562ab08..7af247472 100644
--- a/src/libtomahawk/widgets/welcomewidget.cpp
+++ b/src/libtomahawk/widgets/welcomewidget.cpp
@@ -81,8 +81,6 @@ WelcomeWidget::WelcomeWidget( QWidget* parent )
     m_tracksModel->setStyle( TrackModel::ShortWithAvatars );
     ui->tracksView->overlay()->setEnabled( false );
     ui->tracksView->setPlaylistModel( m_tracksModel );
-    ui->tracksView->setHeaderHidden( true );
-    ui->tracksView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
 
     m_recentAlbumsModel = new AlbumModel( ui->additionsView );
     ui->additionsView->setAlbumModel( m_recentAlbumsModel );