diff --git a/src/ui/reviewLocationsCollection.tsx b/src/ui/reviewLocationsCollection.tsx
index 94fc92c3..9525f074 100644
--- a/src/ui/reviewLocationsCollection.tsx
+++ b/src/ui/reviewLocationsCollection.tsx
@@ -31,7 +31,7 @@ export default class ReviewLocationsCollection extends React.Component<ReviewLoc
       <div>
         {filter.showPoints &&
          locations.map(location =>
-          <ReviewLocationComponent key={location.id} location={location} showDialog={(e) => this.onLocationClick(e, location)} />
+          <ReviewLocationComponent key={location.id || "unsaved"} location={location} showDialog={(e) => this.onLocationClick(e, location)} />
         )}
       </div>)
   };
diff --git a/src/ui/reviewStore.tsx b/src/ui/reviewStore.tsx
index a13dfa26..48a12efb 100644
--- a/src/ui/reviewStore.tsx
+++ b/src/ui/reviewStore.tsx
@@ -262,7 +262,7 @@ class ReviewComponentStore implements IReviewComponentStore {
                 positionX: reviewLocation.positionX,
                 positionY: reviewLocation.positionY,
                 priority: reviewLocation.priority,
-                comments: reviewLocation.comments.map((x: any) => { 
+                comments: reviewLocation.comments.map((x: any) => {
                     return {
                         author: x.author,
                         date: x.date,
@@ -278,6 +278,7 @@ class ReviewComponentStore implements IReviewComponentStore {
             };
             this._advancedReviewService.add(reviewLocation.id, data).then((result) => {
                 if (reviewLocation.id !== result.id) {
+                    reviewLocation.id = result.id;
                     this.reviewLocations.push(reviewLocation);
                 }
                 resolve(reviewLocation);