diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 1c1d2530a..bc9f0362a 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -194,8 +194,6 @@ set(
     GUI/canvaswrappernode.cpp
     GUI/changewidthwidget.cpp
     #GUI/closesignalingdockwidget.cpp
-    GUI/ecombobox.cpp
-    GUI/editablecombobox.cpp
     GUI/ekeyfilter.cpp
     GUI/ewidgetsimpl.cpp
     GUI/fakemenubar.cpp
@@ -313,8 +311,6 @@ set(
     GUI/canvaswrappernode.h
     GUI/changewidthwidget.h
     #GUI/closesignalingdockwidget.h
-    GUI/ecombobox.h
-    GUI/editablecombobox.h
     GUI/ekeyfilter.h
     GUI/ewidgetsimpl.h
     GUI/fakemenubar.h
diff --git a/src/app/GUI/BoxesList/boxsinglewidget.cpp b/src/app/GUI/BoxesList/boxsinglewidget.cpp
index ef6d037eb..f3bfde03b 100755
--- a/src/app/GUI/BoxesList/boxsinglewidget.cpp
+++ b/src/app/GUI/BoxesList/boxsinglewidget.cpp
@@ -84,7 +84,7 @@ bool BoxSingleWidget::sStaticPixmapsLoaded = false;
 #include "PathEffects/patheffectcollection.h"
 #include "Sound/esoundobjectbase.h"
 
-#include "GUI/ecombobox.h"
+#include "widgets/ecombobox.h"
 
 #include <QApplication>
 #include <QDrag>
diff --git a/src/app/GUI/RenderWidgets/outputsettingsprofilesdialog.cpp b/src/app/GUI/RenderWidgets/outputsettingsprofilesdialog.cpp
index 6470313d4..c82454888 100755
--- a/src/app/GUI/RenderWidgets/outputsettingsprofilesdialog.cpp
+++ b/src/app/GUI/RenderWidgets/outputsettingsprofilesdialog.cpp
@@ -28,7 +28,7 @@
 #include "outputsettingsdialog.h"
 #include "outputsettingsdisplaywidget.h"
 #include "GUI/global.h"
-#include "GUI/editablecombobox.h"
+#include "widgets/editablecombobox.h"
 
 OutputProfilesDialog::OutputProfilesDialog(
         const OutputSettings &currentSettings,
diff --git a/src/app/GUI/fontswidget.cpp b/src/app/GUI/fontswidget.cpp
index 3d8df6745..ad06cac62 100755
--- a/src/app/GUI/fontswidget.cpp
+++ b/src/app/GUI/fontswidget.cpp
@@ -31,7 +31,7 @@
 #include <QIntValidator>
 #include <QLabel>
 
-#include "editablecombobox.h"
+#include "widgets/editablecombobox.h"
 
 FontsWidget::FontsWidget(QWidget *parent)
     : QWidget(parent)
diff --git a/src/app/GUI/layouthandler.cpp b/src/app/GUI/layouthandler.cpp
index 419673a0d..f066e60fe 100755
--- a/src/app/GUI/layouthandler.cpp
+++ b/src/app/GUI/layouthandler.cpp
@@ -25,7 +25,7 @@
 
 #include "layouthandler.h"
 #include "Private/document.h"
-#include "editablecombobox.h"
+#include "widgets/editablecombobox.h"
 
 #include <QPushButton>
 
diff --git a/src/app/GUI/mainwindow.cpp b/src/app/GUI/mainwindow.cpp
index a9a82fd4d..1282d3ae9 100755
--- a/src/app/GUI/mainwindow.cpp
+++ b/src/app/GUI/mainwindow.cpp
@@ -52,7 +52,7 @@
 #include "GUI/global.h"
 #include "filesourcescache.h"
 #include "fillstrokesettings.h"
-#include "editablecombobox.h"
+#include "widgets/editablecombobox.h"
 
 #include "Sound/soundcomposition.h"
 #include "GUI/BoxesList/boxsinglewidget.h"
diff --git a/src/app/GUI/renderoutputwidget.cpp b/src/app/GUI/renderoutputwidget.cpp
index eee981630..06ce7720e 100755
--- a/src/app/GUI/renderoutputwidget.cpp
+++ b/src/app/GUI/renderoutputwidget.cpp
@@ -26,7 +26,7 @@
 #include "renderoutputwidget.h"
 
 #include "GUI/edialogs.h"
-#include "editablecombobox.h"
+#include "widgets/editablecombobox.h"
 
 #include <QLineEdit>
 #include <QDir>
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index e99f90a06..dcff72ea6 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -39,6 +39,8 @@ set(
     widgets/actionbutton.cpp
     widgets/alignwidget.cpp
     widgets/assetswidget.cpp
+    widgets/ecombobox.cpp
+    widgets/editablecombobox.cpp
     widgets/buttonbase.cpp
     widgets/uilayout.cpp
 )
@@ -50,6 +52,8 @@ set(
     widgets/alignwidget.h
     widgets/assetswidget.h
     widgets/buttonbase.h
+    widgets/ecombobox.h
+    widgets/editablecombobox.h
     widgets/toolbutton.h
     widgets/uilayout.h
     widgets/vlabel.h
diff --git a/src/app/GUI/ecombobox.cpp b/src/ui/widgets/ecombobox.cpp
similarity index 100%
rename from src/app/GUI/ecombobox.cpp
rename to src/ui/widgets/ecombobox.cpp
diff --git a/src/app/GUI/ecombobox.h b/src/ui/widgets/ecombobox.h
similarity index 94%
rename from src/app/GUI/ecombobox.h
rename to src/ui/widgets/ecombobox.h
index a441981f9..f537396f7 100755
--- a/src/app/GUI/ecombobox.h
+++ b/src/ui/widgets/ecombobox.h
@@ -26,9 +26,12 @@
 #ifndef ECOMBOBOX_H
 #define ECOMBOBOX_H
 
+#include "ui_global.h"
+
 #include <QComboBox>
 
-class eComboBox : public QComboBox {
+class UI_EXPORT eComboBox : public QComboBox
+{
 public:
     using QComboBox::QComboBox;
 
diff --git a/src/app/GUI/editablecombobox.cpp b/src/ui/widgets/editablecombobox.cpp
similarity index 100%
rename from src/app/GUI/editablecombobox.cpp
rename to src/ui/widgets/editablecombobox.cpp
diff --git a/src/app/GUI/editablecombobox.h b/src/ui/widgets/editablecombobox.h
similarity index 93%
rename from src/app/GUI/editablecombobox.h
rename to src/ui/widgets/editablecombobox.h
index e6ccd3a2f..6f06d3673 100755
--- a/src/app/GUI/editablecombobox.h
+++ b/src/ui/widgets/editablecombobox.h
@@ -26,9 +26,11 @@
 #ifndef EDITABLECOMBOBOX_H
 #define EDITABLECOMBOBOX_H
 
+#include "ui_global.h"
+
 #include <QComboBox>
 
-class EditableComboBox : public QComboBox
+class UI_EXPORT EditableComboBox : public QComboBox
 {
 public:
     EditableComboBox(QWidget* const parent,