diff --git a/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp b/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp
index 5f25c391b..aa88a24d6 100644
--- a/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp
+++ b/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp
@@ -9,6 +9,7 @@
 
 #include "network/servent.h"
 #include "tomahawk/tomahawkapp.h"
+#include "playlist/playlistmanager.h"
 
 using namespace Tomahawk;
 
@@ -84,7 +85,7 @@ DatabaseCommand_CreateDynamicPlaylist::postCommitHook()
     qDebug() << Q_FUNC_INFO << "..reporting..";
     if( m_playlist.isNull() ) {
         source_ptr src = source();
-        QMetaObject::invokeMethod( TomahawkApp::instance()->mainWindow(),
+        QMetaObject::invokeMethod( PlaylistManager::instance(),
                                    "createDynamicPlaylist",
                                    Qt::BlockingQueuedConnection,
                                    QGenericArgument( "Tomahawk::source_ptr", (const void*)&src ),
diff --git a/src/libtomahawk/database/databasecommand_createplaylist.cpp b/src/libtomahawk/database/databasecommand_createplaylist.cpp
index 123333daf..80811359c 100644
--- a/src/libtomahawk/database/databasecommand_createplaylist.cpp
+++ b/src/libtomahawk/database/databasecommand_createplaylist.cpp
@@ -4,6 +4,7 @@
 
 #include "network/servent.h"
 #include "tomahawk/tomahawkapp.h"
+#include "playlist/playlistmanager.h"
 
 using namespace Tomahawk;
 
@@ -43,7 +44,7 @@ DatabaseCommand_CreatePlaylist::postCommitHook()
     qDebug() << Q_FUNC_INFO << "..reporting..";
     if( m_playlist.isNull() ) {
         source_ptr src = source();
-        QMetaObject::invokeMethod( TomahawkApp::instance()->mainWindow(),
+        QMetaObject::invokeMethod( PlaylistManager::instance(),
                                 "createPlaylist",
                                 Qt::BlockingQueuedConnection,
                                 QGenericArgument( "Tomahawk::source_ptr", (const void*)&src ),