diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ModelNodeView.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ModelNodeView.qml
index d6574f660ca..19b3c4c35d7 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ModelNodeView.qml
+++ b/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ModelNodeView.qml
@@ -37,7 +37,7 @@ View3D {
     function fitToViewPort()
     {
         // The magic number is the distance from camera default pos to origin
-        _generalHelper.calculateNodeBoundsAndFocusCamera(theCamera, importScene, root,
+        _generalHelper.calculateNodeBoundsAndFocusCamera(theCamera, sourceModel, root,
                                                          1040);
     }
 
@@ -65,7 +65,7 @@ View3D {
 
     Model {
         id: model
-        source: sourceModel.source
+        source: _generalHelper.resolveAbsoluteSourceUrl(sourceModel)
         geometry: sourceModel.geometry
 
         materials: [
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp
index 66cd2d80b8e..dcd0a98549b 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp
@@ -42,6 +42,7 @@
 #include <QtQuick3DRuntimeRender/private/qssgrendermodel_p.h>
 #include <QtQuick3DUtils/private/qssgbounds3_p.h>
 #include <QtQuick3DUtils/private/qssgutils_p.h>
+#include <QtQml/qqml.h>
 #include <QtQuick/qquickwindow.h>
 #include <QtQuick/qquickitem.h>
 #include <QtCore/qmath.h>
@@ -93,6 +94,26 @@ QString GeneralHelper::generateUniqueName(const QString &nameRoot)
     return QStringLiteral("%1_%2").arg(nameRoot).arg(count);
 }
 
+// Resolves absolute model source path
+QUrl GeneralHelper::resolveAbsoluteSourceUrl(const QQuick3DModel *sourceModel)
+{
+    if (!sourceModel)
+        return {};
+
+    const QUrl source = sourceModel->source();
+    if (source.hasFragment()) {
+        // Fragment is part of the url separated by '#', check if it is an index or primitive
+        bool isNumber = false;
+        source.fragment().toInt(&isNumber);
+        // If it wasn't an index, then it was a primitive and we can return it as-is
+        if (!isNumber)
+            return source;
+    }
+
+    const QQmlContext *context = qmlContext(sourceModel);
+    return context ? context->resolvedUrl(source) : source;
+}
+
 void GeneralHelper::orbitCamera(QQuick3DCamera *camera, const QVector3D &startRotation,
                                 const QVector3D &lookAtPoint, const QVector3D &pressPos,
                                 const QVector3D &currentPos)
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h
index ac67172ab32..562848c7720 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h
@@ -33,6 +33,7 @@
 #include <QPointer>
 #include <QQuaternion>
 #include <QTimer>
+#include <QUrl>
 #include <QVariant>
 #include <QVector3D>
 #include <QtQuick3D/private/qquick3dpickresult_p.h>
@@ -58,6 +59,7 @@ public:
 
     Q_INVOKABLE void requestOverlayUpdate();
     Q_INVOKABLE QString generateUniqueName(const QString &nameRoot);
+    Q_INVOKABLE QUrl resolveAbsoluteSourceUrl(const QQuick3DModel *sourceModel);
 
     Q_INVOKABLE void orbitCamera(QQuick3DCamera *camera, const QVector3D &startRotation,
                                  const QVector3D &lookAtPoint, const QVector3D &pressPos,
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index 9656e0e5e89..0d6c069faec 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
@@ -1091,9 +1091,15 @@ void Qt5InformationNodeInstanceServer::doRenderModelNode3DImageView()
             m_modelNode3DImageViewData.window->resize(renderSize);
             m_modelNode3DImageViewData.rootItem->setSize(renderSize);
 
-            QMetaObject::invokeMethod(
-                        m_modelNode3DImageViewData.rootItem, "createViewForObject",
-                        Q_ARG(QVariant, objectToVariant(instanceObj)));
+            if (createdFromComponent) {
+                QMetaObject::invokeMethod(
+                            m_modelNode3DImageViewData.rootItem, "createViewForNode",
+                            Q_ARG(QVariant, objectToVariant(instanceObj)));
+            } else {
+                QMetaObject::invokeMethod(
+                            m_modelNode3DImageViewData.rootItem, "createViewForObject",
+                            Q_ARG(QVariant, objectToVariant(instanceObj)));
+            }
 
             // Need to render twice, first render updates spatial nodes
             for (int i = 0; i < 2; ++i) {