diff --git a/app/qml/main.qml b/app/qml/main.qml
index 0c9f8332f..51f330572 100644
--- a/app/qml/main.qml
+++ b/app/qml/main.qml
@@ -194,19 +194,31 @@ ApplicationWindow {
       map.highlightPair( pair )
     }
 
-    onEditingGeometryStarted: formsStackManager.geometryEditingStarted()
+    onEditingGeometryStarted: 
+    {
+      mapPanelsStackView.hideMapStackIfNeeded()
+      formsStackManager.geometryEditingStarted()
+    }
     onEditingGeometryFinished: function( pair ) {
+      mapPanelsStackView.showMapStack()
       formsStackManager.geometryEditingFinished( pair )
     }
     onEditingGeometryCanceled: {
+      mapPanelsStackView.showMapStack()
       formsStackManager.geometryEditingFinished( null, false )
     }
 
-    onRecordInLayerFeatureStarted: formsStackManager.geometryEditingStarted()
+    onRecordInLayerFeatureStarted: 
+    {
+      mapPanelsStackView.hideMapStackIfNeeded()
+      formsStackManager.geometryEditingStarted()
+    }
     onRecordInLayerFeatureFinished: function( pair ) {
+      mapPanelsStackView.showMapStack()
       formsStackManager.recordInLayerFinished( pair )
     }
     onRecordInLayerFeatureCanceled: {
+      mapPanelsStackView.showMapStack()
       formsStackManager.recordInLayerFinished( null, false )
     }
 
@@ -442,6 +454,17 @@ ApplicationWindow {
         easing.type: Easing.OutCubic
       }
     }
+
+    function hideMapStackIfNeeded() {
+      // if present in the stack, hide the other layers when editing the geometry
+      if(mapPanelsStackView.depth > 0){
+        mapPanelsStackView.visible = false
+      }
+    }
+
+    function showMapStack(){
+        mapPanelsStackView.visible = false
+    }
   }
 
   Component {