diff --git a/src/libtomahawk/Query.cpp b/src/libtomahawk/Query.cpp
index 271a049cb..378bb8d0c 100644
--- a/src/libtomahawk/Query.cpp
+++ b/src/libtomahawk/Query.cpp
@@ -494,9 +494,19 @@ QString
 Query::toString() const
 {
     if ( !isFullTextQuery() )
-        return QString( "Query(%1, %2 - %3)" ).arg( id() ).arg( artist() ).arg( track() );
+    {
+        return QString( "Query(%1, %2 - %3%4)" )
+                  .arg( id() )
+                  .arg( artist() )
+                  .arg( track() )
+                  .arg( album().isEmpty() ? "" : QString( " on %1" ).arg( album() ) );
+    }
     else
-        return QString( "Query(%1, Fulltext: %2)" ).arg( id() ).arg( fullTextQuery() );
+    {
+        return QString( "Query(%1, Fulltext: %2)" )
+                  .arg( id() )
+                  .arg( fullTextQuery() );
+    }
 }