diff --git a/Telegram/SourceFiles/editor/editor_paint.cpp b/Telegram/SourceFiles/editor/editor_paint.cpp
index c12748484..f8f5d38cb 100644
--- a/Telegram/SourceFiles/editor/editor_paint.cpp
+++ b/Telegram/SourceFiles/editor/editor_paint.cpp
@@ -43,7 +43,7 @@ std::shared_ptr<Scene> EnsureScene(
 
 } // namespace
 
-using ItemPtr = Scene::ItemPtr;
+using ItemPtr = std::shared_ptr<QGraphicsItem>;
 
 Paint::Paint(
 	not_null<Ui::RpWidget*> parent,
diff --git a/Telegram/SourceFiles/editor/scene/scene.cpp b/Telegram/SourceFiles/editor/scene/scene.cpp
index 5aa1d5ff5..df9d4020f 100644
--- a/Telegram/SourceFiles/editor/scene/scene.cpp
+++ b/Telegram/SourceFiles/editor/scene/scene.cpp
@@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Editor {
 namespace {
 
-using ItemPtr = Scene::ItemPtr;
+using ItemPtr = std::shared_ptr<NumberedItem>;
 
 bool SkipMouseEvent(not_null<QGraphicsSceneMouseEvent*> event) {
 	return event->isAccepted() || (event->button() == Qt::RightButton);
@@ -66,7 +66,7 @@ void Scene::removeItem(not_null<QGraphicsItem*> item) {
 	removeItem(*it);
 }
 
-void Scene::removeItem(const ItemPtr &item) {
+void Scene::removeItem(const std::shared_ptr<QGraphicsItem> &item) {
 	// Scene loses ownership of an item.
 	QGraphicsScene::removeItem(item.get());
 
@@ -115,8 +115,8 @@ std::vector<ItemPtr> Scene::items(
 	auto copyItems = _items;
 
 	ranges::sort(copyItems, [&](ItemPtr a, ItemPtr b) {
-		const auto numA = static_cast<NumberedItem*>(a.get())->number();
-		const auto numB = static_cast<NumberedItem*>(b.get())->number();
+		const auto numA = a->number();
+		const auto numB = b->number();
 		return (order == Qt::AscendingOrder) ? (numA < numB) : (numA > numB);
 	});
 
diff --git a/Telegram/SourceFiles/editor/scene/scene.h b/Telegram/SourceFiles/editor/scene/scene.h
index dca1c20d5..810bb99cb 100644
--- a/Telegram/SourceFiles/editor/scene/scene.h
+++ b/Telegram/SourceFiles/editor/scene/scene.h
@@ -25,7 +25,7 @@ class NumberedItem;
 
 class Scene final : public QGraphicsScene {
 public:
-	using ItemPtr = std::shared_ptr<QGraphicsItem>;
+	using ItemPtr = std::shared_ptr<NumberedItem>;
 
 	Scene(const QRectF &rect);
 	~Scene();
@@ -33,9 +33,9 @@ public:
 
 	[[nodiscard]] std::vector<ItemPtr> items(
 		Qt::SortOrder order = Qt::DescendingOrder) const;
-	void addItem(std::shared_ptr<NumberedItem> item);
+	void addItem(ItemPtr item);
 	void removeItem(not_null<QGraphicsItem*> item);
-	void removeItem(const ItemPtr &item);
+	void removeItem(const std::shared_ptr<QGraphicsItem> &item);
 	[[nodiscard]] rpl::producer<> addsItem() const;
 	[[nodiscard]] rpl::producer<> removesItem() const;