diff --git a/app/qml/components/MMToolbar.qml b/app/qml/components/MMToolbar.qml
index abd03e2b43..3e1568fca5 100644
--- a/app/qml/components/MMToolbar.qml
+++ b/app/qml/components/MMToolbar.qml
@@ -119,6 +119,9 @@ Rectangle {
       text: model.btnData.text
 
       onClicked: {
+        // Prevent freezing by clearing focus from all elements
+        // Issues #3389 and #3483
+        root.forceActiveFocus()
         root.index = model.index
         model.btnData.clicked()
       }
diff --git a/app/qml/form/MMFormPage.qml b/app/qml/form/MMFormPage.qml
index fddabf3b35..228533669f 100644
--- a/app/qml/form/MMFormPage.qml
+++ b/app/qml/form/MMFormPage.qml
@@ -209,10 +209,7 @@ Page {
         text: qsTr( "Edit geometry" )
         iconSource: __style.editIcon
         visible: root.layerIsSpatial
-        onClicked: {
-          root.forceActiveFocus() // clear focus from all elements to prevent freezing #3483
-          root.editGeometryRequested( root.controller.featureLayerPair )
-        }
+        onClicked: root.editGeometryRequested( root.controller.featureLayerPair )
       }
     }