diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66495127..9adc3be7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 2.0.0
-* prevent Draw Donut On Non-Digitizer Features ([PR#120](https://github.com/mapbender/mapbender-digitizer/pull/120))
+* Remove bug that allowed a feature to revert to a status it had before the last save. ([PR#123] https://github.com/mapbender/mapbender-digitizer/pull/123)
+* Prevent Draw Donut On Non-Digitizer Features ([PR#120](https://github.com/mapbender/mapbender-digitizer/pull/120))
 * Prevent self intersection of polygons not only on modification, but on creation as well ([PR#118](https://github.com/mapbender/mapbender-digitizer/pull/118))
 * Allow leaving modification mode on pressing escape ([PR#118](https://github.com/mapbender/mapbender-digitizer/pull/118))
 * Allow deletion of vertices on single click ([PR#118](https://github.com/mapbender/mapbender-digitizer/pull/118))
diff --git a/src/Mapbender/DigitizerBundle/Resources/public/contextMenu.js b/src/Mapbender/DigitizerBundle/Resources/public/contextMenu.js
index 6001d1c3..4ce9a833 100644
--- a/src/Mapbender/DigitizerBundle/Resources/public/contextMenu.js
+++ b/src/Mapbender/DigitizerBundle/Resources/public/contextMenu.js
@@ -78,7 +78,7 @@
         getMenuItems: function(feature) {
             var items = [];
             var widget = this.widget;
-            if (feature.get('dirty') && feature.get('oldGeometry')) {
+            if (feature.get('dirty') && feature.get('oldGeometry') && !feature.get("editing")) { // show contextmenu only when feature not in editing mode
                 items.push({
                     text: Mapbender.trans('mb.digitizer.revert.geometry'),
                     callback: function() {
diff --git a/src/Mapbender/DigitizerBundle/Resources/public/mapbender.element.digitizer.js b/src/Mapbender/DigitizerBundle/Resources/public/mapbender.element.digitizer.js
index 7d27ab6c..bbe64963 100644
--- a/src/Mapbender/DigitizerBundle/Resources/public/mapbender.element.digitizer.js
+++ b/src/Mapbender/DigitizerBundle/Resources/public/mapbender.element.digitizer.js
@@ -538,6 +538,7 @@
                         feature.setGeometry(geometry);
                         widget._replaceItemData(itemSchema, feature, savedItem.properties || {});
                         feature.set('dirty', false);
+                        feature.set('oldGeometry', geometry);
                         widget.tableRenderer.refreshRow(feature, false);
                         widget._saveEvent(itemSchema, feature, widget._getUniqueItemId(feature));
                     }