diff --git a/src/libtomahawk/utils/LinkGenerator.cpp b/src/libtomahawk/utils/LinkGenerator.cpp
index aa5bbda6c..085264e90 100644
--- a/src/libtomahawk/utils/LinkGenerator.cpp
+++ b/src/libtomahawk/utils/LinkGenerator.cpp
@@ -76,24 +76,21 @@ void
 LinkGenerator::copyScriptJobResultToClipboard( const QVariantMap& data )
 {
     m_clipboardLongUrl = data[ "url" ].toUrl();
-    copyToClipboardReady( m_clipboardLongUrl, m_clipboardLongUrl );
 
-    sender()->deleteLater();
-}
-
-
-void
-LinkGenerator::copyScriptJobResultToClipboardShortened( const QVariantMap& data )
-{
-    m_clipboardLongUrl = data[ "url" ].toUrl();
-
-    Tomahawk::Utils::ShortLinkHelper* slh = new Tomahawk::Utils::ShortLinkHelper();
-    connect( slh, SIGNAL( shortLinkReady( QUrl, QUrl, QVariant ) ),
-             SLOT( copyToClipboardReady( QUrl, QUrl, QVariant ) ) );
-    connect( slh, SIGNAL( done() ),
-             slh, SLOT( deleteLater() ),
-             Qt::QueuedConnection );
-    slh->shortenLink( m_clipboardLongUrl );
+    if ( data[ "shortenLink" ].toBool() )
+    {
+        Tomahawk::Utils::ShortLinkHelper* slh = new Tomahawk::Utils::ShortLinkHelper();
+        connect( slh, SIGNAL( shortLinkReady( QUrl, QUrl, QVariant ) ),
+                SLOT( copyToClipboardReady( QUrl, QUrl, QVariant ) ) );
+        connect( slh, SIGNAL( done() ),
+                slh, SLOT( deleteLater() ),
+                Qt::QueuedConnection );
+        slh->shortenLink( m_clipboardLongUrl );
+    }
+    else
+    {
+        copyToClipboardReady( m_clipboardLongUrl, m_clipboardLongUrl );
+    }
 
     sender()->deleteLater();
 }
diff --git a/src/libtomahawk/utils/LinkGenerator.h b/src/libtomahawk/utils/LinkGenerator.h
index d2bb028a2..1ad111a3c 100644
--- a/src/libtomahawk/utils/LinkGenerator.h
+++ b/src/libtomahawk/utils/LinkGenerator.h
@@ -82,16 +82,6 @@ public:
     }
 
     // Fire and forget
-
-    // the query link is shortened automatically
-    void copyOpenLink( const query_ptr& query ) const
-    {
-        ScriptJob* job = openLink( query );
-        connect( job, SIGNAL( done( QVariantMap ) ), SLOT( copyScriptJobResultToClipboardShortened( QVariantMap ) ), Qt::QueuedConnection );
-        job->start();
-    }
-
-    // all others are not
     template <typename T> void copyOpenLink( const T& item ) const
     {
         ScriptJob* job = openLink( item );
@@ -102,7 +92,6 @@ public:
 private slots:
     void copyToClipboardReady( const QUrl& longUrl, const QUrl& shortUrl, const QVariant& callbackObj = QVariant() );
     void copyScriptJobResultToClipboard( const QVariantMap& data );
-    void copyScriptJobResultToClipboardShortened( const QVariantMap& data );
 
 private:
     explicit LinkGenerator( QObject* parent = 0 );
diff --git a/src/libtomahawk/utils/TomaHkLinkGeneratorPlugin.cpp b/src/libtomahawk/utils/TomaHkLinkGeneratorPlugin.cpp
index ee497cfe0..9724c2b84 100644
--- a/src/libtomahawk/utils/TomaHkLinkGeneratorPlugin.cpp
+++ b/src/libtomahawk/utils/TomaHkLinkGeneratorPlugin.cpp
@@ -52,6 +52,7 @@ Tomahawk::Utils::TomaHkLinkGeneratorPlugin::openLink( const QString& title, cons
 
     QVariantMap data;
     data[ "url" ] = link;
+    data[ "shortenLink" ] = true;
 
     return new SyncScriptJob( data );
 }