diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc
index 7b358c83c3c..6da16c4b89d 100644
--- a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc
+++ b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc
@@ -1696,15 +1696,6 @@ static void GREASE_PENCIL_OT_stroke_reorder(wmOperatorType *ot)
 /** \name Move To Layer Operator
  * \{ */
 
-static int grease_pencil_move_to_layer_invoke(bContext *C, wmOperator *op, const wmEvent *event)
-{
-  const bool add_new_layer = RNA_boolean_get(op->ptr, "add_new_layer");
-  if (add_new_layer) {
-    return WM_operator_props_popup_confirm(C, op, event);
-  }
-  return OPERATOR_RUNNING_MODAL;
-}
-
 static int grease_pencil_move_to_layer_exec(bContext *C, wmOperator *op)
 {
   using namespace bke::greasepencil;
@@ -1788,6 +1779,15 @@ static int grease_pencil_move_to_layer_exec(bContext *C, wmOperator *op)
   return OPERATOR_FINISHED;
 }
 
+static int grease_pencil_move_to_layer_invoke(bContext *C, wmOperator *op, const wmEvent *event)
+{
+  const bool add_new_layer = RNA_boolean_get(op->ptr, "add_new_layer");
+  if (add_new_layer) {
+    return WM_operator_props_popup_confirm(C, op, event);
+  }
+  return grease_pencil_move_to_layer_exec(C, op);
+}
+
 static void GREASE_PENCIL_OT_move_to_layer(wmOperatorType *ot)
 {
   PropertyRNA *prop;