diff --git a/src/widgets/availablesourcesview.cpp b/src/widgets/availablesourcesview.cpp
index da30f34a..0e3f7052 100644
--- a/src/widgets/availablesourcesview.cpp
+++ b/src/widgets/availablesourcesview.cpp
@@ -1,201 +1,207 @@
 /* This file is part of Zanshin
 
    Copyright 2014 Kevin Ottens <ervin@kde.org>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
    published by the Free Software Foundation; either version 2 of
    the License or (at your option) version 3 or any later version
    accepted by the membership of KDE e.V. (or its successor approved
    by the membership of KDE e.V.), which shall act as a proxy
    defined in Section 14 of version 3 of the license.
 
    This program 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 General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.
 */
 
 
 #include "availablesourcesview.h"
 
 #include <algorithm>
 
 #include <QAction>
 #include <QApplication>
 #include <QHeaderView>
 #include <QSortFilterProxyModel>
 #include <QToolBar>
 #include <QTreeView>
 #include <QVBoxLayout>
 
 #include <KAboutData>
 #include <KLineEdit>
 #include <KGlobal>
 #include <KComponentData>
 
 #include "presentation/metatypes.h"
 #include "presentation/querytreemodelbase.h"
 
 #include "widgets/datasourcedelegate.h"
 
 using namespace Widgets;
 
 AvailableSourcesView::AvailableSourcesView(QWidget *parent)
     : QWidget(parent),
       m_defaultAction(new QAction(this)),
       m_model(Q_NULLPTR),
       m_sortProxy(new QSortFilterProxyModel(this)),
       m_sourcesView(new QTreeView(this))
 {
     m_sortProxy->setDynamicSortFilter(true);
     m_sortProxy->sort(0);
 
     auto searchEdit = new KLineEdit(this);
     searchEdit->setObjectName("searchEdit");
     searchEdit->setClearButtonShown(true);
     searchEdit->setClickMessage(tr("Search..."));
     connect(searchEdit, SIGNAL(textChanged(QString)),
             this, SLOT(onSearchTextChanged(QString)));
 #ifndef ZANSHIN_HIDING_SOURCES_ENABLED
     searchEdit->hide();
 #endif
 
     m_sourcesView->setObjectName("sourcesView");
     m_sourcesView->header()->hide();
     m_sourcesView->setModel(m_sortProxy);
     connect(m_sourcesView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
             this, SLOT(onSelectionChanged()));
+    connect(m_sourcesView->model(), SIGNAL(rowsInserted(QModelIndex, int, int)),
+            m_sourcesView, SLOT(expand(QModelIndex)));
+    connect(m_sourcesView->model(), SIGNAL(layoutChanged()),
+            m_sourcesView, SLOT(expandAll()));
+    connect(m_sourcesView->model(), SIGNAL(modelReset()),
+            m_sourcesView, SLOT(expandAll()));
 
     auto delegate = new DataSourceDelegate(m_sourcesView);
 #ifndef ZANSHIN_HIDING_SOURCES_ENABLED
     delegate->setActionsEnabled(false);
 #endif
     connect(delegate, SIGNAL(actionTriggered(Domain::DataSource::Ptr,int)),
             this, SLOT(onActionTriggered(Domain::DataSource::Ptr,int)));
     m_sourcesView->setItemDelegate(delegate);
 
     auto actionBar = new QToolBar(this);
     actionBar->setObjectName("actionBar");
     actionBar->setIconSize(QSize(16, 16));
 
     m_defaultAction->setObjectName("defaultAction");
     m_defaultAction->setText(tr("Use as default source"));
     m_defaultAction->setIcon(QIcon::fromTheme("folder-favorites"));
     connect(m_defaultAction, SIGNAL(triggered()), this, SLOT(onDefaultTriggered()));
     actionBar->addAction(m_defaultAction);
 
     auto layout = new QVBoxLayout;
     layout->addWidget(searchEdit);
     layout->addWidget(m_sourcesView);
 
     auto actionBarLayout = new QHBoxLayout;
     actionBarLayout->setAlignment(Qt::AlignRight);
     actionBarLayout->addWidget(actionBar);
     layout->addLayout(actionBarLayout);
     setLayout(layout);
 
     auto settingsAction = new QAction(this);
     settingsAction->setObjectName("settingsAction");
     settingsAction->setText(tr("Configure %1...").arg(KGlobal::mainComponent().aboutData()->programName()));
     settingsAction->setIcon(QIcon::fromTheme("configure"));
     connect(settingsAction, SIGNAL(triggered()), this, SLOT(onSettingsTriggered()));
     m_actions.insert("options_configure", settingsAction);
 
     onSelectionChanged();
 }
 
 QHash<QString, QAction *> AvailableSourcesView::globalActions() const
 {
     return m_actions;
 }
 
 QObject *AvailableSourcesView::model() const
 {
     return m_model;
 }
 
 void AvailableSourcesView::setModel(QObject *model)
 {
     if (model == m_model)
         return;
 
     m_sortProxy->setSourceModel(Q_NULLPTR);
 
     m_model = model;
 
     setSourceModel("sourceListModel");
 }
 
 void AvailableSourcesView::onSelectionChanged()
 {
     const auto selectedIndexes = m_sourcesView->selectionModel()->selectedIndexes();
     auto selectedSources = Domain::DataSource::List();
     std::transform(selectedIndexes.constBegin(), selectedIndexes.constEnd(),
                    std::back_inserter(selectedSources),
                    [] (const QModelIndex &index) {
                        return index.data(Presentation::QueryTreeModelBase::ObjectRole)
                                    .value<Domain::DataSource::Ptr>();
                    });
 
     m_defaultAction->setEnabled(selectedSources.size() == 1
                              && selectedSources.first()->contentTypes() != Domain::DataSource::NoContent);
 }
 
 void AvailableSourcesView::onSettingsTriggered()
 {
     QMetaObject::invokeMethod(m_model, "showConfigDialog");
 }
 
 void AvailableSourcesView::onDefaultTriggered()
 {
     const auto currentIndex = m_sourcesView->currentIndex();
     const auto index = m_sortProxy->mapToSource(currentIndex);
     if (index.isValid())
         QMetaObject::invokeMethod(m_model, "setDefaultItem",
                                   Q_ARG(QModelIndex, index));
 }
 
 void AvailableSourcesView::onActionTriggered(const Domain::DataSource::Ptr &source, int action)
 {
     switch (action) {
     case DataSourceDelegate::AddToList:
         QMetaObject::invokeMethod(m_model, "listSource",
                                   Q_ARG(Domain::DataSource::Ptr, source));
         break;
     case DataSourceDelegate::RemoveFromList:
         QMetaObject::invokeMethod(m_model, "unlistSource",
                                   Q_ARG(Domain::DataSource::Ptr, source));
         break;
     case DataSourceDelegate::Bookmark:
         QMetaObject::invokeMethod(m_model, "bookmarkSource",
                                   Q_ARG(Domain::DataSource::Ptr, source));
         break;
     default:
         qFatal("Shouldn't happen");
         break;
     }
 }
 
 void AvailableSourcesView::setSourceModel(const QByteArray &propertyName)
 {
     QVariant modelProperty = m_model->property(propertyName);
     if (modelProperty.canConvert<QAbstractItemModel*>())
         m_sortProxy->setSourceModel(modelProperty.value<QAbstractItemModel*>());
 }
 
 void AvailableSourcesView::onSearchTextChanged(const QString &text)
 {
     if (text.size() <= 2) {
         m_model->setProperty("searchTerm", QString());
         setSourceModel("sourceListModel");
     } else {
         m_model->setProperty("searchTerm", text);
         setSourceModel("searchListModel");
     }
 }