diff --git a/src/Annotator/reducers/general-reducer.js b/src/Annotator/reducers/general-reducer.js
index e0ef59ea..f77509c2 100644
--- a/src/Annotator/reducers/general-reducer.js
+++ b/src/Annotator/reducers/general-reducer.js
@@ -196,11 +196,12 @@ export default (state, action) => {
         return setIn(
           modifyRegion(polygon, {
             points: polygon.points.slice(0, -1),
+            editingLabels: true,
             open: false,
           }),
           ["mode"],
           null
-        )
+          )
       } else {
         state = saveToHistory(state, i18next.t("move.polypoint"))
       }
@@ -721,7 +722,11 @@ export default (state, action) => {
           return state
         }
         case "MOVE_LINE_POINT": {
-          return {...state, mode: null}
+          return setIn(
+            modifyRegion(state.mode.regionId, { editingLabels: true }),
+            ["mode"],
+            null
+            )
         }
         case "DRAW_EXPANDING_LINE": {
           const [expandingLine, regionIndex] = getRegion(state.mode.regionId)
@@ -897,8 +902,10 @@ export default (state, action) => {
         return setIn(
           state,
           [...pathToActiveImage, "regions"],
-          regions.map((r) => ({
+          regions.map((r) => (
+            {
             ...r,
+            name: r.name || r.id,
             editingLabels: false,
           }))
         )