diff --git a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp
index 1fffa4774..827e02bc7 100644
--- a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp
+++ b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp
@@ -90,8 +90,6 @@ PlayableProxyModelPlaylistInterface::setCurrentIndex( qint64 index )
     if ( m_proxyModel.isNull() )
         return;
 
-    PlaylistInterface::setCurrentIndex( index );
-
     PlayableItem* item = static_cast<PlayableItem*>( (void*)index );
     if ( index < 0 || !item )
     {
@@ -116,6 +114,8 @@ PlayableProxyModelPlaylistInterface::setCurrentIndex( qint64 index )
         m_shuffleHistory << queryAt( index );
         m_shuffleCache = QPersistentModelIndex();
     }
+
+    PlaylistInterface::setCurrentIndex( index );
 }