diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index 826887587..4c10d987d 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -524,7 +524,7 @@ TomahawkApp::loadUrl( const QString& url )
         if( f.exists() && info.suffix() == "xspf" ) {
             XSPFLoader* l = new XSPFLoader( true, this );
             qDebug() << "Loading spiff:" << url;
-            l->load( QUrl( url ) );
+            l->load( QUrl::fromUserInput( url ) );
         }
     }
     return true;
diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp
index 97adfb7ca..20de04fa1 100644
--- a/src/tomahawkwindow.cpp
+++ b/src/tomahawkwindow.cpp
@@ -385,15 +385,7 @@ TomahawkWindow::loadSpiff()
         return;
 
     XSPFLoader* loader = new XSPFLoader;
-    QFileInfo info( urlstr );
-    if( info.isFile() )
-    {
-        QFile f( urlstr );
-        loader->load( f );
-    } else
-    {
-        loader->load( QUrl( urlstr ) );
-    }
+    loader->load( QUrl::fromUserInput( urlstr ) );
 }