diff --git a/src/libtomahawk/playlist/PlaylistUpdaterInterface.cpp b/src/libtomahawk/playlist/PlaylistUpdaterInterface.cpp
index 7daca9d30..2a43b950b 100644
--- a/src/libtomahawk/playlist/PlaylistUpdaterInterface.cpp
+++ b/src/libtomahawk/playlist/PlaylistUpdaterInterface.cpp
@@ -103,6 +103,10 @@ PlaylistUpdaterInterface::setAutoUpdate( bool autoUpdate )
 
     const QString key = QString( "playlistupdaters/%1/autoupdate" ).arg( m_playlist->guid() );
     TomahawkSettings::instance()->setValue( key, m_autoUpdate );
+
+    // Update immediately as well
+    if ( m_autoUpdate )
+        QTimer::singleShot( 0, this, SLOT( updateNow() ) );
 }
 
 void
diff --git a/src/libtomahawk/utils/xspfloader.cpp b/src/libtomahawk/utils/xspfloader.cpp
index d4430a6ad..0318295a1 100644
--- a/src/libtomahawk/utils/xspfloader.cpp
+++ b/src/libtomahawk/utils/xspfloader.cpp
@@ -223,7 +223,7 @@ XSPFLoader::gotBody()
                                        m_entries );
 
         Tomahawk::XspfUpdater* updater = new Tomahawk::XspfUpdater( m_playlist, m_url.toString() );
-        updater->setInterval( 60000 );
+        updater->setInterval(  1200000 ); // 20 minute default for now, no way to change it
         updater->setAutoUpdate( m_autoUpdate );
         deleteLater();
     }