diff --git a/GUI/View/Mask/MaskDrawingContext.cpp b/GUI/View/Mask/MaskDrawingContext.cpp
index 8b149e36b5992da2c0a60b41144cd5f67276eac9..c82ab536c037f0e9ec462a3e3b5a267fa23e37c1 100644
--- a/GUI/View/Mask/MaskDrawingContext.cpp
+++ b/GUI/View/Mask/MaskDrawingContext.cpp
@@ -17,7 +17,6 @@
 
 MaskDrawingContext::MaskDrawingContext()
     : m_current_activity(MaskEditorFlags::PAN_ZOOM_MODE)
-    , m_mask_value(MaskEditorFlags::MASK_ON)
 {
 }
 
@@ -31,11 +30,6 @@ void MaskDrawingContext::setActivityType(MaskEditorFlags::Activity value)
     m_current_activity = value;
 }
 
-void MaskDrawingContext::setMaskValue(MaskEditorFlags::MaskValue value)
-{
-    m_mask_value = value;
-}
-
 bool MaskDrawingContext::isSelectionMode() const
 {
     return m_current_activity == MaskEditorFlags::SELECTION_MODE;
@@ -93,11 +87,6 @@ bool MaskDrawingContext::isROIMode() const
     return m_current_activity == MaskEditorFlags::ROI_MODE;
 }
 
-bool MaskDrawingContext::getMaskValue() const
-{
-    return bool(m_mask_value);
-}
-
 //! Returns true, if proposed activity requires the cancel of drawing
 //! i.e. there is an ungoing polygon drawing, but user wants to start other drawing
 bool MaskDrawingContext::isActivityRequiresDrawingCancel(
diff --git a/GUI/View/Mask/MaskDrawingContext.h b/GUI/View/Mask/MaskDrawingContext.h
index 95afbd3e32bd74ac5a3014d63c13d717ed657763..fc0a4cbbffde38964fc4bcacf121118797b6a41d 100644
--- a/GUI/View/Mask/MaskDrawingContext.h
+++ b/GUI/View/Mask/MaskDrawingContext.h
@@ -25,7 +25,6 @@ public:
 
     MaskEditorFlags::Activity getActivityType() const;
     void setActivityType(MaskEditorFlags::Activity value);
-    void setMaskValue(MaskEditorFlags::MaskValue value);
 
     bool isSelectionMode() const;
     bool isInZoomMode() const;
@@ -39,15 +38,12 @@ public:
     bool isMaskAllMode() const;
     bool isROIMode() const;
 
-    bool getMaskValue() const;
-
     bool isActivityRequiresDrawingCancel(MaskEditorFlags::Activity proposed_new_activity) const;
 
     int activityToRow() const;
 
 private:
     MaskEditorFlags::Activity m_current_activity;
-    MaskEditorFlags::MaskValue m_mask_value;
 };
 
 #endif // BORNAGAIN_GUI_VIEW_MASK_MASKDRAWINGCONTEXT_H
diff --git a/GUI/View/Mask/MaskGraphicsScene.cpp b/GUI/View/Mask/MaskGraphicsScene.cpp
index f36704766dda06447cae296712ff010a58ea7467..d0c75aae4c074f8a80b262b6e33346b0580d65e2 100644
--- a/GUI/View/Mask/MaskGraphicsScene.cpp
+++ b/GUI/View/Mask/MaskGraphicsScene.cpp
@@ -38,6 +38,7 @@ MaskGraphicsScene::MaskGraphicsScene(QObject* parent)
     : QGraphicsScene(parent)
     , m_colorMap(new ColorMap)
     , m_drawing_in_progress(false)
+    , m_mask_value(MaskEditorFlags::MASK_ON)
 {
     setSceneRect(0, 0, 800, 600);
     connect(this, &MaskGraphicsScene::selectionChanged, this,
@@ -115,7 +116,7 @@ void MaskGraphicsScene::onActivityChanged(MaskEditorFlags::Activity value)
 
 void MaskGraphicsScene::onMaskValueChanged(MaskEditorFlags::MaskValue value)
 {
-    m_context.setMaskValue(value);
+    m_mask_value = value;
 }
 
 void MaskGraphicsScene::onRowsInserted(const QModelIndex&, int, int)
@@ -627,7 +628,7 @@ void MaskGraphicsScene::processRectangleOrEllipseItem(QGraphicsSceneMouseEvent*
         m_currentItem = newMaskItem; // downcast MaskItem* -> MaskRoot*
 
         if (!m_context.isROIMode())
-            dynamic_cast<MaskItem*>(m_currentItem)->setMaskValue(m_context.getMaskValue());
+            dynamic_cast<MaskItem*>(m_currentItem)->setMaskValue(m_mask_value);
 
         m_maskContainerItem->updateMaskNames();
 
@@ -664,7 +665,7 @@ void MaskGraphicsScene::processPolygonItem(QGraphicsSceneMouseEvent* event)
         m_drawing_in_progress = true;
         PolygonItem* new_poly = new PolygonItem;
         m_maskContainerModel->insertMask(0, new_poly);
-        new_poly->setMaskValue(m_context.getMaskValue());
+        new_poly->setMaskValue(m_mask_value);
         m_currentItem = new_poly;
         m_selectionModel->clearSelection();
         m_selectionModel->select(m_maskContainerModel->indexOfItem(m_currentItem),
@@ -703,7 +704,7 @@ void MaskGraphicsScene::processLineItem(QGraphicsSceneMouseEvent* event)
     m_selectionModel->select(m_maskContainerModel->indexOfItem(m_currentItem),
                              QItemSelectionModel::Select);
     m_maskContainerItem->updateMaskNames();
-    dynamic_cast<MaskItem*>(m_currentItem)->setMaskValue(m_context.getMaskValue());
+    dynamic_cast<MaskItem*>(m_currentItem)->setMaskValue(m_mask_value);
 
     emit lineItemProcessed();
 
diff --git a/GUI/View/Mask/MaskGraphicsScene.h b/GUI/View/Mask/MaskGraphicsScene.h
index e5db2d56ac66982f9a00bbf70370c3c5a79091b1..013d2b9c0296b8d79e19898d4419a9f989e60de5 100644
--- a/GUI/View/Mask/MaskGraphicsScene.h
+++ b/GUI/View/Mask/MaskGraphicsScene.h
@@ -125,6 +125,7 @@ private:
     MaskRoot* m_currentItem = nullptr;
     QPointF m_currentMousePosition;
     bool m_drawing_in_progress;
+    MaskEditorFlags::MaskValue m_mask_value;
     MaskDrawingContext m_context;
 };