diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp
index 7de3bc6a7..a5a762549 100644
--- a/src/libtomahawk/ViewManager.cpp
+++ b/src/libtomahawk/ViewManager.cpp
@@ -94,11 +94,11 @@ ViewManager::ViewManager( QObject* parent )
     m_inboxModel->setDescription( tr( "Listening suggestions from your friends" ) );
     m_inboxModel->setIcon( TomahawkUtils::defaultPixmap( TomahawkUtils::Inbox ) );
 
-    m_contextWidget = new ContextWidget();
+//    m_contextWidget = new ContextWidget();
 
     m_widget->layout()->addWidget( m_infobar );
     m_widget->layout()->addWidget( m_stack );
-    m_widget->layout()->addWidget( m_contextWidget );
+//    m_widget->layout()->addWidget( m_contextWidget );
 
     m_superCollectionView = new TreeWidget();
     m_superCollectionView->view()->proxyModel()->setStyle( PlayableProxyModel::Collection );
@@ -128,7 +128,7 @@ ViewManager::~ViewManager()
     delete m_newReleasesWidget;
     delete m_recentPlaysWidget;
     delete m_inboxWidget;
-    delete m_contextWidget;
+//    delete m_contextWidget;
     delete m_widget;
 }
 
diff --git a/src/libtomahawk/ViewManager.h b/src/libtomahawk/ViewManager.h
index 1351f0817..94cb9bfb8 100644
--- a/src/libtomahawk/ViewManager.h
+++ b/src/libtomahawk/ViewManager.h
@@ -43,7 +43,6 @@ class AlbumInfoWidget;
 class ArtistInfoWidget;
 class TreeWidget;
 class CollectionModel;
-class ContextWidget;
 class FlexibleView;
 class FlexibleTreeView;
 class PlaylistModel;
@@ -77,7 +76,6 @@ public:
 
     QWidget* widget() const { return m_widget; }
     InfoBar* infobar() const { return m_infobar; }
-    ContextWidget* context() const { return m_contextWidget; }
 
     PlaylistView* queue() const { return m_queue->queue(); }
     void setQueue( QueueView* queue ) { m_queue = queue; }
@@ -183,7 +181,6 @@ private:
 
     QWidget* m_widget;
     InfoBar* m_infobar;
-    ContextWidget* m_contextWidget;
     QStackedWidget* m_stack;
     AnimatedSplitter* m_splitter;
 
diff --git a/src/libtomahawk/playlist/GridView.cpp b/src/libtomahawk/playlist/GridView.cpp
index f0c1fe9a9..7971b3d1b 100644
--- a/src/libtomahawk/playlist/GridView.cpp
+++ b/src/libtomahawk/playlist/GridView.cpp
@@ -162,8 +162,8 @@ GridView::currentChanged( const QModelIndex& current, const QModelIndex& previou
     PlayableItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( current ) );
     if ( item )
     {
-        if ( !item->album().isNull() )
-            ViewManager::instance()->context()->setAlbum( item->album() );
+//        if ( !item->album().isNull() )
+//            ViewManager::instance()->context()->setAlbum( item->album() );
     }
 }
 
diff --git a/src/libtomahawk/playlist/TrackView.cpp b/src/libtomahawk/playlist/TrackView.cpp
index 4ecca309a..d195de800 100644
--- a/src/libtomahawk/playlist/TrackView.cpp
+++ b/src/libtomahawk/playlist/TrackView.cpp
@@ -349,13 +349,13 @@ TrackView::currentChanged( const QModelIndex& current, const QModelIndex& previo
 {
     QTreeView::currentChanged( current, previous );
 
-    if ( !m_updateContextView )
-        return;
-
     PlayableItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( current ) );
-    if ( item )
+    if ( item && item->query() )
     {
-        ViewManager::instance()->context()->setQuery( item->query() );
+//        if ( m_updateContextView )
+//            ViewManager::instance()->context()->setQuery( item->query() );
+
+        emit querySelected( item->query() );
     }
 }
 
diff --git a/src/libtomahawk/playlist/TrackView.h b/src/libtomahawk/playlist/TrackView.h
index 0398c0dfa..feb0fca19 100644
--- a/src/libtomahawk/playlist/TrackView.h
+++ b/src/libtomahawk/playlist/TrackView.h
@@ -102,6 +102,7 @@ public slots:
 
 signals:
     void itemActivated( const QModelIndex& index );
+    void querySelected( const Tomahawk::query_ptr& query );
     void modelChanged();
 
 protected:
diff --git a/src/libtomahawk/playlist/TreeView.cpp b/src/libtomahawk/playlist/TreeView.cpp
index 84702a155..1535416a8 100644
--- a/src/libtomahawk/playlist/TreeView.cpp
+++ b/src/libtomahawk/playlist/TreeView.cpp
@@ -213,7 +213,7 @@ TreeView::currentChanged( const QModelIndex& current, const QModelIndex& previou
     if ( !m_updateContextView )
         return;
 
-    PlayableItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( current ) );
+/*    PlayableItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( current ) );
     if ( item )
     {
         if ( !item->result().isNull() )
@@ -224,7 +224,7 @@ TreeView::currentChanged( const QModelIndex& current, const QModelIndex& previou
             ViewManager::instance()->context()->setAlbum( item->album() );
         else if ( !item->query().isNull() )
             ViewManager::instance()->context()->setQuery( item->query() );
-    }
+    }*/
 }