1 files changed, 7 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp
index 6c0e6df5..f17c56f1 100644
--- a/src/quicktemplates2/qquickcontainer.cpp
+++ b/src/quicktemplates2/qquickcontainer.cpp
@@ -85,12 +85,14 @@ void QQuickContainerPrivate::cleanup()
             QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Destroyed | QQuickItemPrivate::Parent | QQuickItemPrivate::SiblingOrder);
     }
 
-    QQuickItem *focusItem = QQuickItemPrivate::get(contentItem)->subFocusItem;
-    if (focusItem && window)
-        QQuickWindowPrivate::get(window)->clearFocusInScope(contentItem, focusItem, Qt::OtherFocusReason);
+    if (contentItem) {
+        QQuickItem *focusItem = QQuickItemPrivate::get(contentItem)->subFocusItem;
+        if (focusItem && window)
+            QQuickWindowPrivate::get(window)->clearFocusInScope(contentItem, focusItem, Qt::OtherFocusReason);
 
-    q->contentItemChange(nullptr, contentItem);
-    delete contentItem;
+        q->contentItemChange(nullptr, contentItem);
+        delete contentItem;
+    }
 
     QObject::disconnect(contentModel, &QQmlObjectModel::countChanged, q, &QQuickContainer::countChanged);
     QObject::disconnect(contentModel, &QQmlObjectModel::childrenChanged, q, &QQuickContainer::contentChildrenChanged);