diff --git a/src/AccountDelegate.cpp b/src/AccountDelegate.cpp
index 618f7d59c..906cb7c03 100644
--- a/src/AccountDelegate.cpp
+++ b/src/AccountDelegate.cpp
@@ -295,6 +295,7 @@ AccountDelegate::paint ( QPainter* painter, const QStyleOptionViewItem& option,
     const int descWidth = rightEdge - leftTitleEdge - PADDING;
     painter->setFont( descFont );
     const QRect descRect( leftTitleEdge, runningBottom + PADDING, descWidth, painter->fontMetrics().height() );
+    desc = painter->fontMetrics().elidedText( desc, Qt::ElideRight, descWidth );
     painter->drawText( descRect, Qt::AlignLeft | Qt::TextWordWrap | Qt::AlignTop, desc );
     runningBottom = descRect.bottom();
 
diff --git a/src/libtomahawk/accounts/AccountModel.cpp b/src/libtomahawk/accounts/AccountModel.cpp
index c9073dd2c..6a4959c93 100644
--- a/src/libtomahawk/accounts/AccountModel.cpp
+++ b/src/libtomahawk/accounts/AccountModel.cpp
@@ -108,6 +108,7 @@ AccountModel::data( const QModelIndex& index, int role ) const
                     return fac->icon();
                 case StateRole:
                     return ShippedWithTomahawk;
+                case Qt::ToolTipRole:
                 case DescriptionRole:
                     return fac->description();
                 case CanRateRole:
@@ -160,6 +161,7 @@ AccountModel::data( const QModelIndex& index, int role ) const
                     return QVariant::fromValue< QPixmap >( AtticaManager::instance()->iconForResolver( c ) );
                 case StateRole:
                     return (int)AtticaManager::instance()->resolverState( c );
+                case Qt::ToolTipRole:
                 case DescriptionRole:
                     return c.description();
                 case AuthorRole:
@@ -235,6 +237,7 @@ AccountModel::data( const QModelIndex& index, int role ) const
                     return node->factory->prettyName();
                 case Qt::DecorationRole:
                     return node->factory->icon();
+                case Qt::ToolTipRole:
                 case DescriptionRole:
                     return node->factory->description();
                 case StateRole: