diff --git a/GUI/View/Plot2D/ColorMap.cpp b/GUI/View/Plot2D/ColorMap.cpp
index 67e71df76efb28d4413c6c000e18f5acd6d37356..7d66ee0772725eeda5fa7b06762f4a3d0b5b247c 100644
--- a/GUI/View/Plot2D/ColorMap.cpp
+++ b/GUI/View/Plot2D/ColorMap.cpp
@@ -49,7 +49,7 @@ ColorMap::ColorMap(QWidget* parent)
     //    setFixedColorMapMargins();
 }
 
-void ColorMap::setDataItem(DataItem *dataItem)
+void ColorMap::setDataItem(DataItem* dataItem)
 {
     ScientificPlot::setDataItem(dataItem);
     setColorMapFromItem();
diff --git a/GUI/View/Plot2D/ColorMapCanvas.cpp b/GUI/View/Plot2D/ColorMapCanvas.cpp
index c234238aeae690077f8bf69df08ba7823868e985..6b0c67e16d03b70c68f1cee4bacdac530ae0f870 100644
--- a/GUI/View/Plot2D/ColorMapCanvas.cpp
+++ b/GUI/View/Plot2D/ColorMapCanvas.cpp
@@ -17,12 +17,10 @@
 #include "GUI/View/Plot2D/ColorMap.h"
 #include "GUI/View/PlotUtil/FontScalingEvent.h"
 #include "GUI/View/PlotUtil/PlotStatusLabel.h"
-#include <QLabel>
-#include <QVBoxLayout>
 
 ColorMapCanvas::ColorMapCanvas(QWidget* parent)
-    : SessionItemWidget(parent)
-    , m_colorMap(new ColorMap)
+    : QWidget(parent)
+    , m_colorMap(new ColorMap(this))
     , m_canvasEvent(new FontScalingEvent(m_colorMap, this))
     , m_statusLabel(new PlotStatusLabel(m_colorMap, this))
 {
@@ -41,7 +39,6 @@ ColorMapCanvas::ColorMapCanvas(QWidget* parent)
 
 void ColorMapCanvas::setIntensityItem(IntensityDataItem* intensityDataItem)
 {
-    SessionItemWidget::setItem(intensityDataItem);
     m_colorMap->setDataItem(intensityDataItem);
 }
 
@@ -60,8 +57,3 @@ void ColorMapCanvas::setStatusLabelEnabled(bool flag)
     m_statusLabel->setLabelEnabled(flag);
     m_statusLabel->setHidden(!flag);
 }
-
-void ColorMapCanvas::onStatusString(const QString& name)
-{
-    m_statusLabel->setText(name);
-}
diff --git a/GUI/View/Plot2D/ColorMapCanvas.h b/GUI/View/Plot2D/ColorMapCanvas.h
index eb1f8df3622aaabb61a3390e3d215e4b7f9f3c44..1be00635776a9d4557e7b9839fb56122365bcb21 100644
--- a/GUI/View/Plot2D/ColorMapCanvas.h
+++ b/GUI/View/Plot2D/ColorMapCanvas.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_PLOTUTIL_COLORMAPCANVAS_H
 #define BORNAGAIN_GUI_VIEW_PLOTUTIL_COLORMAPCANVAS_H
 
-#include "GUI/View/Common/SessionItemWidget.h"
+#include <QWidget>
 
 class ColorMap;
 class FontScalingEvent;
@@ -24,10 +24,9 @@ class PlotStatusLabel;
 class QCustomPlot;
 
 //! The ColorMapCanvas class contains ColorMap for intensity data presentation, and provide
-//! control of font size, status string appearance, defines common actions
-//! (reset view, save plot, show context menu).
+//! control of font size, status string appearance
 
-class ColorMapCanvas : public SessionItemWidget {
+class ColorMapCanvas : public QWidget {
     Q_OBJECT
 
 public:
@@ -40,9 +39,6 @@ public:
 
     void setStatusLabelEnabled(bool flag);
 
-public slots:
-    void onStatusString(const QString& name);
-
 private:
     ColorMap* m_colorMap;
     FontScalingEvent* m_canvasEvent;
diff --git a/GUI/View/Plot2D/IntensityDataCanvas.cpp b/GUI/View/Plot2D/IntensityDataCanvas.cpp
index 704fbbbfa2df2d4be141e6af55ee0deed2fff019..16996f9acce030bbdc8d71d7fd6dbcd47bea0695 100644
--- a/GUI/View/Plot2D/IntensityDataCanvas.cpp
+++ b/GUI/View/Plot2D/IntensityDataCanvas.cpp
@@ -40,7 +40,7 @@ const QString SettingsKeyInterpolation = SettingsGroup + "Interpolation";
 
 IntensityDataCanvas::IntensityDataCanvas(QWidget* parent)
     : SessionItemWidget(parent)
-    , m_colorMap(new ColorMapCanvas)
+    , m_colorMapCanvas(new ColorMapCanvas(this))
     , m_resetViewAction(nullptr)
     , m_rotateDataAction(nullptr)
     , m_savePlotAction(nullptr)
@@ -50,21 +50,21 @@ IntensityDataCanvas::IntensityDataCanvas(QWidget* parent)
     auto* layout = new QVBoxLayout;
     layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
-    layout->addWidget(m_colorMap);
+    layout->addWidget(m_colorMapCanvas);
     setLayout(layout);
 
-    m_colorMap->setStatusLabelEnabled(true);
+    m_colorMapCanvas->setStatusLabelEnabled(true);
 
     initActions();
 
-    connect(m_colorMap->customPlot(), &QCustomPlot::mousePress, this,
+    connect(m_colorMapCanvas->customPlot(), &QCustomPlot::mousePress, this,
             &IntensityDataCanvas::onMousePress, Qt::UniqueConnection);
 }
 
 void IntensityDataCanvas::setIntensityItem(IntensityDataItem* intensityItem)
 {
     SessionItemWidget::setItem(intensityItem);
-    m_colorMap->setIntensityItem(intensityDataItem());
+    m_colorMapCanvas->setIntensityItem(intensityDataItem());
 
     if (!m_rotateDataAction)
         initRotation();
@@ -96,7 +96,7 @@ void IntensityDataCanvas::onResetViewAction()
 void IntensityDataCanvas::onSavePlotAction()
 {
     QString dirname = gSessionData->projectDocument.value()->userExportDir();
-    GUI::Plot::savePlot(dirname, m_colorMap->customPlot(), intensityDataItem()->getDatafield());
+    GUI::Plot::savePlot(dirname, m_colorMapCanvas->customPlot(), intensityDataItem()->getDatafield());
 }
 
 void IntensityDataCanvas::onMousePress(QMouseEvent* event)
diff --git a/GUI/View/Plot2D/IntensityDataCanvas.h b/GUI/View/Plot2D/IntensityDataCanvas.h
index 9da19c2c66b819bae095715c3c08f591e7726726..fbb3ed695bab1d0a41c92f2f45247d14c62c218c 100644
--- a/GUI/View/Plot2D/IntensityDataCanvas.h
+++ b/GUI/View/Plot2D/IntensityDataCanvas.h
@@ -52,7 +52,7 @@ private:
     void initActions();
     void initRotation();
 
-    ColorMapCanvas* m_colorMap;
+    ColorMapCanvas* m_colorMapCanvas;
     QAction* m_resetViewAction;
     QAction* m_rotateDataAction;
     QAction* m_savePlotAction;
diff --git a/GUI/View/PlotSpecular/SpecularPlotCanvas.cpp b/GUI/View/PlotSpecular/SpecularPlotCanvas.cpp
index 737ae7df23a1f7bdc1819e7ecdfdd8bd77670c43..f34373e10fa8ab305c292bec79699e642e0ac361 100644
--- a/GUI/View/PlotSpecular/SpecularPlotCanvas.cpp
+++ b/GUI/View/PlotSpecular/SpecularPlotCanvas.cpp
@@ -21,7 +21,7 @@
 
 SpecularPlotCanvas::SpecularPlotCanvas(QWidget* parent)
     : DataItemBundleWidget(parent)
-    , m_plot(new SpecularPlot)
+    , m_plot(new SpecularPlot(this))
     , m_canvasEvent(new FontScalingEvent(m_plot, this))
     , m_statusLabel(new PlotStatusLabel(m_plot, this))
 {