diff --git a/MainWindow.h b/MainWindow.h
index bf12b7c..e9e28ff 100644
--- a/MainWindow.h
+++ b/MainWindow.h
@@ -296,9 +296,11 @@ public:
   }
   void removeCurrentPaint() {
     _hasCurrentPaint = false;
+    currentPaintId = NULL_UID;
   }
   void removeCurrentMapping() {
     _hasCurrentMapping = false;
+    currentMappingId = NULL_UID;
   }
 
 public: