diff --git a/app/widget/timelinewidget/tool/add.cpp b/app/widget/timelinewidget/tool/add.cpp
index 866a384d2..a765b0d73 100644
--- a/app/widget/timelinewidget/tool/add.cpp
+++ b/app/widget/timelinewidget/tool/add.cpp
@@ -130,9 +130,9 @@ Node *AddTool::CreateAddableClip(MultiUndoCommand *command, Sequence *sequence,
     clip = new SubtitleBlock();
   } else {
     clip = new ClipBlock();
+    clip->SetLabel(olive::Tool::GetAddableObjectName(Core::instance()->GetSelectedAddableObject()));
   }
   clip->set_length_and_media_out(length);
-  clip->SetLabel(olive::Tool::GetAddableObjectName(Core::instance()->GetSelectedAddableObject()));
 
   NodeGraph* graph = sequence->parent();
 
diff --git a/app/widget/timelinewidget/view/timelineview.cpp b/app/widget/timelinewidget/view/timelineview.cpp
index b6f23d911..dcdb9c66b 100644
--- a/app/widget/timelinewidget/view/timelineview.cpp
+++ b/app/widget/timelinewidget/view/timelineview.cpp
@@ -490,7 +490,7 @@ void TimelineView::DrawBlock(QPainter *painter, bool foreground, Block *block, q
     if (foreground) {
       painter->setBrush(Qt::NoBrush);
 
-      QString using_label = block->GetLabel().isEmpty() ? block->Name() : block->GetLabel();
+      QString using_label = block->GetLabelOrName();
 
       QRectF text_rect = r.adjusted(text_padding, text_padding, -text_padding, -text_padding);
       painter->setPen(block->is_enabled() ? ColorCoding::GetUISelectorColor(block->color()) : Qt::lightGray);