diff --git a/src/libtomahawk/ContextMenu.cpp b/src/libtomahawk/ContextMenu.cpp
index faaac4bbe..9f226450a 100644
--- a/src/libtomahawk/ContextMenu.cpp
+++ b/src/libtomahawk/ContextMenu.cpp
@@ -151,8 +151,8 @@ ContextMenu::setAlbums( const QList<Tomahawk::album_ptr>& albums )
 
     addSeparator();
 
-/*    if ( m_supportedActions & ActionCopyLink && itemCount() == 1 )
-        m_sigmap->setMapping( addAction( tr( "Copy Album &Link" ) ), ActionCopyLink ); */
+    if ( m_supportedActions & ActionCopyLink && itemCount() == 1 )
+        m_sigmap->setMapping( addAction( tr( "Copy Album &Link" ) ), ActionCopyLink );
 
     foreach ( QAction* action, actions() )
     {
@@ -193,8 +193,8 @@ ContextMenu::setArtists( const QList<Tomahawk::artist_ptr>& artists )
 
     addSeparator();
 
-/*    if ( m_supportedActions & ActionCopyLink && itemCount() == 1 )
-        m_sigmap->setMapping( addAction( tr( "Copy Artist &Link" ) ), ActionCopyLink ); */
+    if ( m_supportedActions & ActionCopyLink && itemCount() == 1 )
+        m_sigmap->setMapping( addAction( tr( "Copy Artist &Link" ) ), ActionCopyLink );
 
     foreach ( QAction* action, actions() )
     {
@@ -274,6 +274,14 @@ ContextMenu::copyLink()
     {
         GlobalActionManager::instance()->copyToClipboard( m_queries.first() );
     }
+    else if ( m_albums.count() )
+    {
+        GlobalActionManager::instance()->copyOpenLink( m_albums.first() );
+    }
+    else if ( m_artists.count() )
+    {
+        GlobalActionManager::instance()->copyOpenLink( m_artists.first() );
+    }
 }