diff --git a/app/qml/form/MMFormPage.qml b/app/qml/form/MMFormPage.qml
index 7715ebdd9..c07bce48d 100644
--- a/app/qml/form/MMFormPage.qml
+++ b/app/qml/form/MMFormPage.qml
@@ -80,7 +80,15 @@ Page {
 
   header: MMComponents.MMPageHeader {
 
-    onBackClicked: root.rollbackAndClose()
+    onBackClicked: {
+      if ( root.controller.hasAnyChanges )  {
+        saveChangesDialog.open()
+      }
+      else {
+        root.rollbackAndClose()
+      }
+    }
+
 
     title: {
       if ( root.state === "add" ) return qsTr( "New feature" )