diff --git a/src/akonadi-contacts/emailaddressselectionwidget.cpp b/src/akonadi-contacts/emailaddressselectionwidget.cpp
index 6a4cbc04..78110df8 100644
--- a/src/akonadi-contacts/emailaddressselectionwidget.cpp
+++ b/src/akonadi-contacts/emailaddressselectionwidget.cpp
@@ -1,222 +1,226 @@
 /*
     This file is part of Akonadi Contact.
 
     Copyright (c) 2010 KDAB
     Author: Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This library is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 #include "emailaddressselectionwidget.h"
 
 #include "emailaddressselection_p.h"
 #include "emailaddressselectionmodel.h"
 #include "emailaddressselectionproxymodel_p.h"
 
 #include <changerecorder.h>
 #include <contactsfilterproxymodel.h>
 #include <contactstreemodel.h>
 #include <controlgui.h>
 #include <entitydisplayattribute.h>
 #include <entitytreeview.h>
 #include <itemfetchscope.h>
 #include <session.h>
 #include <kcontacts/addressee.h>
 #include <kcontacts/contactgroup.h>
 #include <KLineEdit>
 #include <KLocalizedString>
 
 #include <QTimer>
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QVBoxLayout>
 
 using namespace Akonadi;
 
 /**
  * @internal
  */
 class SearchLineEdit : public QLineEdit
 {
     Q_OBJECT
 public:
     SearchLineEdit(QWidget *receiver, QWidget *parent = nullptr)
         : QLineEdit(parent)
         , mReceiver(receiver)
     {
         setClearButtonEnabled(true);
     }
 
 protected:
     void keyPressEvent(QKeyEvent *event) override
     {
         if (event->key() == Qt::Key_Down) {
             QMetaObject::invokeMethod(mReceiver, "setFocus");
         }
 
         QLineEdit::keyPressEvent(event);
     }
 
 private:
     QWidget *mReceiver;
 };
 
 /**
  * @internal
  */
 class Q_DECL_HIDDEN EmailAddressSelectionWidget::Private
 {
 public:
     Private(bool showOnlyContactWithEmail, EmailAddressSelectionWidget *qq, QAbstractItemModel *model)
         : q(qq)
         , mModel(model)
         , mShowOnlyContactWithEmail(showOnlyContactWithEmail)
     {
         init();
     }
 
     void init();
 
     EmailAddressSelectionWidget *q;
     QAbstractItemModel *mModel;
     QLabel *mDescriptionLabel;
     SearchLineEdit *mSearchLine;
     Akonadi::EntityTreeView *mView;
     EmailAddressSelectionProxyModel *mSelectionModel;
     bool mShowOnlyContactWithEmail;
 };
 
 void EmailAddressSelectionWidget::Private::init()
 {
     // setup internal model if needed
     if (!mModel) {
         Akonadi::EmailAddressSelectionModel *model = new Akonadi::EmailAddressSelectionModel(q);
         mModel = model->model();
     }
 
     // setup ui
     QVBoxLayout *layout = new QVBoxLayout(q);
     layout->setMargin(0);
 
     mDescriptionLabel = new QLabel;
     mDescriptionLabel->hide();
     layout->addWidget(mDescriptionLabel);
 
     QHBoxLayout *searchLayout = new QHBoxLayout;
     searchLayout->setMargin(0);
     layout->addLayout(searchLayout);
 
     mView = new Akonadi::EntityTreeView;
 
     QLabel *label = new QLabel(i18nc("@label Search in a list of contacts", "Search:"));
     mSearchLine = new SearchLineEdit(mView);
     label->setBuddy(mSearchLine);
     searchLayout->addWidget(label);
     searchLayout->addWidget(mSearchLine);
 
 #ifndef QT_NO_DRAGANDDROP
     mView->setDragDropMode(QAbstractItemView::NoDragDrop);
 #endif
     layout->addWidget(mView);
 
     Akonadi::ContactsFilterProxyModel *filter = new Akonadi::ContactsFilterProxyModel(q);
     if (mShowOnlyContactWithEmail) {
         filter->setFilterFlags(ContactsFilterProxyModel::HasEmail);
     }
     filter->setExcludeVirtualCollections(true);
     filter->setSourceModel(mModel);
 
     mSelectionModel = new EmailAddressSelectionProxyModel(q);
     mSelectionModel->setSourceModel(filter);
 
     mView->setModel(mSelectionModel);
     mView->header()->hide();
 
     q->connect(mSearchLine, &QLineEdit::textChanged,
                filter, &ContactsFilterProxyModel::setFilterString);
 
     q->connect(mView, SIGNAL(doubleClicked(Akonadi::Item)),
                q, SIGNAL(doubleClicked()));
     ControlGui::widgetNeedsAkonadi(q);
 
     mSearchLine->setFocus();
 
-    QTimer::singleShot(1000, mView, &QTreeView::expandAll);
+    if (Akonadi::EntityTreeModel *etm = qobject_cast<Akonadi::EntityTreeModel*>(mModel)) {
+        QObject::connect(etm, &Akonadi::EntityTreeModel::collectionTreeFetched, mView, &QTreeView::expandAll);
+    } else {
+        QTimer::singleShot(1000, mView, &QTreeView::expandAll);
+    }
 }
 
 EmailAddressSelectionWidget::EmailAddressSelectionWidget(QWidget *parent)
     : QWidget(parent)
     , d(new Private(true, this, nullptr))
 {
 }
 
 EmailAddressSelectionWidget::EmailAddressSelectionWidget(QAbstractItemModel *model, QWidget *parent)
     : QWidget(parent)
     , d(new Private(true, this, model))
 {
 }
 
 EmailAddressSelectionWidget::EmailAddressSelectionWidget(bool showOnlyContactWithEmail, QAbstractItemModel *model, QWidget *parent)
     : QWidget(parent)
     , d(new Private(showOnlyContactWithEmail, this, model))
 {
 }
 
 EmailAddressSelectionWidget::~EmailAddressSelectionWidget()
 {
     delete d;
 }
 
 EmailAddressSelection::List EmailAddressSelectionWidget::selectedAddresses() const
 {
     EmailAddressSelection::List selections;
 
     if (!d->mView->selectionModel()) {
         return selections;
     }
 
     const QModelIndexList selectedRows = d->mView->selectionModel()->selectedRows(0);
     for (const QModelIndex &index : selectedRows) {
         EmailAddressSelection selection;
         selection.d->mName = index.data(EmailAddressSelectionProxyModel::NameRole).toString();
         selection.d->mEmailAddress = index.data(EmailAddressSelectionProxyModel::EmailAddressRole).toString();
         selection.d->mItem = index.data(ContactsTreeModel::ItemRole).value<Akonadi::Item>();
 
         if (d->mShowOnlyContactWithEmail) {
             if (!selection.d->mEmailAddress.isEmpty()) {
                 selections << selection;
             }
         } else {
             selections << selection;
         }
     }
 
     return selections;
 }
 
 QLineEdit *EmailAddressSelectionWidget::searchLineEdit() const
 {
     return d->mSearchLine;
 }
 
 QTreeView *EmailAddressSelectionWidget::view() const
 {
     return d->mView;
 }
 
 #include "emailaddressselectionwidget.moc"