diff --git a/GUI/View/Frame/MaskEditingFrame.cpp b/GUI/View/Frame/MaskEditingFrame.cpp
index b85b497fa5dca53758a6fd5e06c416e9e061cc06..e8f486ea077afa7377d2b569d9e343814ed5ba8b 100644
--- a/GUI/View/Frame/MaskEditingFrame.cpp
+++ b/GUI/View/Frame/MaskEditingFrame.cpp
@@ -16,9 +16,9 @@
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Data/Data2DItem.h"
 #include "GUI/Model/Mask/MaskeditorListmodel.h"
-#include "GUI/View/Canvas/MaskEditorActions.h"
 #include "GUI/View/Canvas/MaskEditorCanvas.h"
 #include "GUI/View/Scene/MaskGraphicsScene.h"
+#include "GUI/View/Setup/MaskEditorActions.h"
 #include "GUI/View/Setup/MaskPanel.h"
 #include "GUI/View/Setup/MaskToolbar.h"
 #include <QSplitter>
diff --git a/GUI/View/Canvas/MaskEditorActions.cpp b/GUI/View/Setup/MaskEditorActions.cpp
similarity index 98%
rename from GUI/View/Canvas/MaskEditorActions.cpp
rename to GUI/View/Setup/MaskEditorActions.cpp
index 4e90ae99a641675c51d3759a416f2df558777c56..ab17f8346fcb2cf6efe157f9c1aaf51d58e996eb 100644
--- a/GUI/View/Canvas/MaskEditorActions.cpp
+++ b/GUI/View/Setup/MaskEditorActions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Canvas/MaskEditorActions.cpp
+//! @file      GUI/View/Setup/MaskEditorActions.cpp
 //! @brief     Implement class MaskEditorActions
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Canvas/MaskEditorActions.h"
+#include "GUI/View/Setup/MaskEditorActions.h"
 #include "GUI/Model/Mask/MaskItems.h"
 #include "GUI/Model/Mask/MaskList.h"
 #include "GUI/Model/Mask/MaskeditorListmodel.h"
diff --git a/GUI/View/Canvas/MaskEditorActions.h b/GUI/View/Setup/MaskEditorActions.h
similarity index 90%
rename from GUI/View/Canvas/MaskEditorActions.h
rename to GUI/View/Setup/MaskEditorActions.h
index 36260e32a579cdf9f28b90853924a2bab48f3844..f08a79f921b0429c65d190eef01a79394b56e866 100644
--- a/GUI/View/Canvas/MaskEditorActions.h
+++ b/GUI/View/Setup/MaskEditorActions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Canvas/MaskEditorActions.h
+//! @file      GUI/View/Setup/MaskEditorActions.h
 //! @brief     Defines class MaskEditorActions.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_CANVAS_MASKEDITORACTIONS_H
-#define BORNAGAIN_GUI_VIEW_CANVAS_MASKEDITORACTIONS_H
+#ifndef BORNAGAIN_GUI_VIEW_SETUP_MASKEDITORACTIONS_H
+#define BORNAGAIN_GUI_VIEW_SETUP_MASKEDITORACTIONS_H
 
 #include <QAction>
 #include <QItemSelectionModel>
@@ -71,4 +71,4 @@ private:
     QItemSelectionModel* m_selectionModel;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_CANVAS_MASKEDITORACTIONS_H
+#endif // BORNAGAIN_GUI_VIEW_SETUP_MASKEDITORACTIONS_H
diff --git a/GUI/View/Setup/MaskToolbar.cpp b/GUI/View/Setup/MaskToolbar.cpp
index 9e1f0ec32a8e63a66d5bda31b682cd980e3383bd..5dde77099c4e74dab109240a70bd38e0aa0ed959 100644
--- a/GUI/View/Setup/MaskToolbar.cpp
+++ b/GUI/View/Setup/MaskToolbar.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Setup/MaskToolbar.h"
 #include "Base/Util/Assert.h"
-#include "GUI/View/Canvas/MaskEditorActions.h"
+#include "GUI/View/Setup/MaskEditorActions.h"
 #include "GUI/View/Tool/mainwindow_constants.h"
 #include <QLabel>
 #include <QRadioButton>