2 files changed, 12 insertions, 2 deletions
diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index 3f5912e344..7b73fcb393 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -1886,6 +1886,8 @@ void QQuickTableViewPrivate::beginRebuildTable()
         viewportRect.moveTop(syncView->d_func()->viewportRect.top());
     }
 
+    syncViewportRect();
+
     if (!model) {
         qCDebug(lcTableViewDelegateLifecycle()) << "no model found, leaving table empty";
         return;
@@ -2252,9 +2254,8 @@ void QQuickTableViewPrivate::syncWithPendingChanges()
     // we're e.g in the middle of e.g loading a new row. Since this will lead to
     // unpredicted behavior, and possibly a crash, we need to postpone taking
     // such assignments into effect until we're in a state that allows it.
-    Q_Q(QQuickTableView);
-    viewportRect = QRectF(q->contentX(), q->contentY(), q->width(), q->height());
 
+    syncViewportRect();
     syncModel();
     syncDelegate();
     syncSyncView();
@@ -2599,6 +2600,14 @@ void QQuickTableViewPrivate::setLocalViewportY(qreal contentY)
     q->setContentY(contentY);
 }
 
+void QQuickTableViewPrivate::syncViewportRect()
+{
+    // Sync viewportRect so that it contains the actual geometry of the viewport
+    Q_Q(QQuickTableView);
+    viewportRect = QRectF(q->contentX(), q->contentY(), q->width(), q->height());
+    qCDebug(lcTableViewDelegateLifecycle) << viewportRect;
+}
+
 void QQuickTableViewPrivate::syncViewportPosRecursive()
 {
     Q_Q(QQuickTableView);
diff --git a/src/quick/items/qquicktableview_p_p.h b/src/quick/items/qquicktableview_p_p.h
index 6c5abcf414..403a77c3ea 100644
--- a/src/quick/items/qquicktableview_p_p.h
+++ b/src/quick/items/qquicktableview_p_p.h
@@ -433,6 +433,7 @@ public:
     void scheduleRebuildIfFastFlick();
     void setLocalViewportX(qreal contentX);
     void setLocalViewportY(qreal contentY);
+    void syncViewportRect();
     void syncViewportPosRecursive();
 
     void fetchMoreData();