From 730a5303df986a041a713f1deb5c8191c81f47f7 Mon Sep 17 00:00:00 2001
From: Richard Kello <richard.kello@lutraconsulting.co.uk>
Date: Thu, 27 Aug 2026 15:42:47 +0200
Subject: [PATCH] Fix app freeze when adding photos to non-spatial layer

---
 app/qml/form/editors/MMFormRelationEditor.qml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/qml/form/editors/MMFormRelationEditor.qml b/app/qml/form/editors/MMFormRelationEditor.qml
index 3ac0eb4c0..28537bc43 100644
--- a/app/qml/form/editors/MMFormRelationEditor.qml
+++ b/app/qml/form/editors/MMFormRelationEditor.qml
@@ -220,9 +220,15 @@ MMPrivateComponents.MMBaseInput {
       button.text: qsTr( "Add feature" )
 
       onClosed: listLoader.active = false
-      onFeatureClicked: ( featurePair ) => root.openLinkedFeature( featurePair )
+      onFeatureClicked: ( featurePair ) => {
+        root.forceActiveFocus()
+        root.openLinkedFeature( featurePair )
+      }
       onSearchTextChanged: ( searchText ) => rmodel.searchExpression = searchText
-      onButtonClicked: root.createLinkedFeature( root._fieldController.featureLayerPair, root._fieldAssociatedRelation )
+      onButtonClicked: {
+        root.forceActiveFocus()
+        root.createLinkedFeature( root._fieldController.featureLayerPair, root._fieldAssociatedRelation )
+      }
 
       Component.onCompleted: open()
     }