diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc
index 465ddeb7594..0d17ba4e70f 100644
--- a/source/blender/editors/object/object_modifier.cc
+++ b/source/blender/editors/object/object_modifier.cc
@@ -3755,7 +3755,7 @@ static int dash_modifier_segment_add_exec(bContext *C, wmOperator *op)
   GreasePencilDashModifierSegment *new_segments = static_cast<GreasePencilDashModifierSegment *>(
       MEM_malloc_arrayN(dmd->segments_num + 1, sizeof(GreasePencilDashModifierSegment), __func__));
 
-  const int new_active_index = dmd->segment_active_index + 1;
+  const int new_active_index = std::clamp(dmd->segment_active_index + 1, 0, dmd->segments_num);
   if (dmd->segments_num != 0) {
     /* Copy the segments before the new segment. */
     memcpy(new_segments,
diff --git a/source/blender/makesdna/DNA_modifier_defaults.h b/source/blender/makesdna/DNA_modifier_defaults.h
index 33ad7b51f88..1932f03b7d6 100644
--- a/source/blender/makesdna/DNA_modifier_defaults.h
+++ b/source/blender/makesdna/DNA_modifier_defaults.h
@@ -888,7 +888,7 @@
 
 #define _DNA_DEFAULT_GreasePencilDashModifierSegment \
   { \
-    .name = "", \
+    .name = "Segment", \
     .dash = 2, \
     .gap = 1, \
     .radius = 1.0f, \