diff --git a/src/corelib/itemmodels/qabstractproxymodel.cpp b/src/corelib/itemmodels/qabstractproxymodel.cpp
index 83e8cb8db3c..abdeefb4da6 100644
--- a/src/corelib/itemmodels/qabstractproxymodel.cpp
+++ b/src/corelib/itemmodels/qabstractproxymodel.cpp
@@ -55,11 +55,39 @@ void QAbstractProxyModelPrivate::_q_sourceModelDestroyed()
     model = QAbstractItemModelPrivate::staticEmptyModel();
 }
 
-static auto emitHeaderDataChanged(QAbstractItemModel *model,
-                                  Qt::Orientation orientation,
-                                  int count)
+void QAbstractProxyModelPrivate::emitHeaderDataChanged()
 {
-    return [=](){ emit model->headerDataChanged(orientation, 0, count); };
+    Q_Q(QAbstractProxyModel);
+
+    if (updateHorizontalHeader) {
+        if (auto columnCount = q->columnCount(); columnCount > 0)
+            emit q->headerDataChanged(Qt::Horizontal, 0, columnCount - 1);
+    }
+
+    if (updateVerticalHeader) {
+        if (auto rowCount = q->rowCount(); rowCount > 0)
+            emit q->headerDataChanged(Qt::Vertical, 0, rowCount - 1);
+    }
+
+    updateHorizontalHeader = false;
+    updateVerticalHeader = false;
+}
+
+void QAbstractProxyModelPrivate::scheduleHeaderUpdate(Qt::Orientation orientation)
+{
+    const bool isUpdateScheduled = updateHorizontalHeader || updateVerticalHeader;
+
+    if (orientation == Qt::Horizontal && !updateHorizontalHeader)
+        updateHorizontalHeader = true;
+    else if (orientation == Qt::Vertical && !updateVerticalHeader)
+        updateVerticalHeader = true;
+    else
+        return;
+
+    if (!isUpdateScheduled) {
+        Q_Q(QAbstractProxyModel);
+        QMetaObject::invokeMethod(q, [this]() { emitHeaderDataChanged(); }, Qt::QueuedConnection);
+    }
 }
 
 void QAbstractProxyModelPrivate::_q_sourceModelRowsAboutToBeInserted(const QModelIndex &parent, int, int)
@@ -73,25 +101,16 @@ void QAbstractProxyModelPrivate::_q_sourceModelRowsInserted(const QModelIndex &p
 {
     if (parent.isValid())
         return;
-    if (sourceHadZeroRows) {
-        Q_Q(QAbstractProxyModel);
-        const int columnCount = q->columnCount();
-        if (columnCount > 0)
-            QMetaObject::invokeMethod(q, emitHeaderDataChanged(q, Qt::Horizontal, columnCount - 1), Qt::QueuedConnection);
-    }
+    if (sourceHadZeroRows)
+        scheduleHeaderUpdate(Qt::Horizontal);
 }
 
-
 void QAbstractProxyModelPrivate::_q_sourceModelRowsRemoved(const QModelIndex &parent, int, int)
 {
     if (parent.isValid())
         return;
-    if (model->rowCount() == 0) {
-        Q_Q(QAbstractProxyModel);
-        const int columnCount = q->columnCount();
-        if (columnCount > 0)
-            QMetaObject::invokeMethod(q, emitHeaderDataChanged(q, Qt::Horizontal, columnCount - 1), Qt::QueuedConnection);
-    }
+    if (model->rowCount() == 0)
+        scheduleHeaderUpdate(Qt::Horizontal);
 }
 
 void QAbstractProxyModelPrivate::_q_sourceModelColumnsAboutToBeInserted(const QModelIndex &parent, int, int)
@@ -105,24 +124,16 @@ void QAbstractProxyModelPrivate::_q_sourceModelColumnsInserted(const QModelIndex
 {
     if (parent.isValid())
         return;
-    if (sourceHadZeroColumns) {
-        Q_Q(QAbstractProxyModel);
-        const int rowCount = q->rowCount();
-        if (rowCount > 0)
-            QMetaObject::invokeMethod(q, emitHeaderDataChanged(q, Qt::Vertical, rowCount - 1), Qt::QueuedConnection);
-    }
+    if (sourceHadZeroColumns)
+        scheduleHeaderUpdate(Qt::Vertical);
 }
 
 void QAbstractProxyModelPrivate::_q_sourceModelColumnsRemoved(const QModelIndex &parent, int, int)
 {
     if (parent.isValid())
         return;
-    if (model->columnCount() == 0) {
-        Q_Q(QAbstractProxyModel);
-        const int rowCount = q->rowCount();
-        if (rowCount > 0)
-            QMetaObject::invokeMethod(q, emitHeaderDataChanged(q, Qt::Vertical, rowCount - 1), Qt::QueuedConnection);
-    }
+    if (model->columnCount() == 0)
+        scheduleHeaderUpdate(Qt::Vertical);
 }
 
 /*!
diff --git a/src/corelib/itemmodels/qabstractproxymodel_p.h b/src/corelib/itemmodels/qabstractproxymodel_p.h
index 678ec4804fb..c495c78f75d 100644
--- a/src/corelib/itemmodels/qabstractproxymodel_p.h
+++ b/src/corelib/itemmodels/qabstractproxymodel_p.h
@@ -30,7 +30,9 @@ public:
     QAbstractProxyModelPrivate()
         : QAbstractItemModelPrivate(),
         sourceHadZeroRows(false),
-        sourceHadZeroColumns(false)
+        sourceHadZeroColumns(false),
+        updateVerticalHeader(false),
+        updateHorizontalHeader(false)
     {}
     void setModelForwarder(QAbstractItemModel *sourceModel)
     {
@@ -57,8 +59,13 @@ public:
     void mapDropCoordinatesToSource(int row, int column, const QModelIndex &parent,
                                     int *source_row, int *source_column, QModelIndex *source_parent) const;
 
+    void scheduleHeaderUpdate(Qt::Orientation orientation);
+    void emitHeaderDataChanged();
+
     unsigned int sourceHadZeroRows : 1;
     unsigned int sourceHadZeroColumns : 1;
+    unsigned int updateVerticalHeader : 1;
+    unsigned int updateHorizontalHeader : 1;
 };
 
 QT_END_NAMESPACE