diff --git a/framework/extensions/qml/Muse/Extensions/CMakeLists.txt b/framework/extensions/qml/Muse/Extensions/CMakeLists.txt
index 0c8bee4562..0799f5fbf0 100644
--- a/framework/extensions/qml/Muse/Extensions/CMakeLists.txt
+++ b/framework/extensions/qml/Muse/Extensions/CMakeLists.txt
@@ -56,5 +56,7 @@ qt_add_qml_module(muse_extensions_qml
 
 fixup_qml_module_dependencies(muse_extensions_qml)
 
+target_link_libraries(muse_extensions_qml PRIVATE muse::uicomponents_qml)
+
 # Necessary for the auto-generated sources
 target_include_directories(muse_extensions_qml PRIVATE devtools)
diff --git a/framework/uicomponents/qml/Muse/UiComponents/selectableitemlistmodel.cpp b/framework/uicomponents/qml/Muse/UiComponents/selectableitemlistmodel.cpp
index f2d9d32d44..5422e6c3fe 100644
--- a/framework/uicomponents/qml/Muse/UiComponents/selectableitemlistmodel.cpp
+++ b/framework/uicomponents/qml/Muse/UiComponents/selectableitemlistmodel.cpp
@@ -26,11 +26,6 @@
 
 using namespace muse::uicomponents;
 
-SelectableItemListModel::Item::Item(QObject* parent)
-    : QObject(parent)
-{
-}
-
 SelectableItemListModel::SelectableItemListModel(QObject* parent)
     : QAbstractListModel(parent), m_selection(new ItemMultiSelectionModel(this))
 {
@@ -238,7 +233,7 @@ const SelectableItemListModel::ItemList& SelectableItemListModel::items() const
     return m_items;
 }
 
-SelectableItemListModel::Item* SelectableItemListModel::item(const QModelIndex& index) const
+QObject* SelectableItemListModel::item(const QModelIndex& index) const
 {
     int row = index.row();
 
@@ -263,7 +258,7 @@ void SelectableItemListModel::setItems(const ItemList& items)
     emit countChanged();
 }
 
-void SelectableItemListModel::insertItem(int row, Item* item)
+void SelectableItemListModel::insertItem(int row, QObject* item)
 {
     TRACEFUNC;
 
diff --git a/framework/uicomponents/qml/Muse/UiComponents/selectableitemlistmodel.h b/framework/uicomponents/qml/Muse/UiComponents/selectableitemlistmodel.h
index bfab473825..6c57a21c94 100644
--- a/framework/uicomponents/qml/Muse/UiComponents/selectableitemlistmodel.h
+++ b/framework/uicomponents/qml/Muse/UiComponents/selectableitemlistmodel.h
@@ -42,15 +42,7 @@ class SelectableItemListModel : public QAbstractListModel
     Q_PROPERTY(bool hasSelection READ hasSelection NOTIFY selectionChanged)
 
 public:
-    class Item : public QObject
-    {
-    public:
-        virtual ~Item() = default;
-
-        explicit Item(QObject* parent = nullptr);
-    };
-
-    using ItemList = QList<Item*>;
+    using ItemList = QList<QObject*>;
 
     explicit SelectableItemListModel(QObject* parent = nullptr);
 
@@ -89,10 +81,10 @@ class SelectableItemListModel : public QAbstractListModel
     virtual void onRowsRemoved();
 
     const ItemList& items() const;
-    Item* item(const QModelIndex& index) const;
+    QObject* item(const QModelIndex& index) const;
 
     void setItems(const ItemList& items);
-    void insertItem(int row, Item* item);
+    void insertItem(int row, QObject* item);
 
     void setIsMovingUpAvailable(bool isMovingUpAvailable);
     void setIsMovingDownAvailable(bool isMovingDownAvailable);
diff --git a/framework/workspace/qml/Muse/Workspace/CMakeLists.txt b/framework/workspace/qml/Muse/Workspace/CMakeLists.txt
index 1386759f4d..31bc4411e3 100644
--- a/framework/workspace/qml/Muse/Workspace/CMakeLists.txt
+++ b/framework/workspace/qml/Muse/Workspace/CMakeLists.txt
@@ -21,3 +21,5 @@ qt_add_qml_module(muse_workspace_qml
 )
 
 fixup_qml_module_dependencies(muse_workspace_qml)
+
+target_link_libraries(muse_workspace_qml PRIVATE muse::uicomponents_qml)