diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index b01c9db..4cd27c7 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -1053,6 +1053,7 @@ void QSortFilterProxyModelPrivate::filter_changed(const QModelIndex &source_pare
     if (it == source_index_mapping.constEnd())
         return;
     Mapping *m = it.value();
+
     QSet<int> rows_removed = handle_filter_changed(m->proxy_rows, m->source_rows, source_parent, Qt::Vertical);
     QSet<int> columns_removed = handle_filter_changed(m->proxy_columns, m->source_columns, source_parent, Qt::Horizontal);

@@ -1339,6 +1340,9 @@ void QSortFilterProxyModelPrivate::_q_sourceLayoutChanged(const QList<QPersisten
     update_persistent_indexes(saved_persistent_indexes);
     saved_persistent_indexes.clear();

+    // We need the invalid index up to date for filtering
+    create_mapping(QModelIndex());
+
     if (dynamic_sortfilter && update_source_sort_column()) {
         //update_source_sort_column might have created wrong mapping so we have to clear it again
         qDeleteAll(source_index_mapping);