diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c
index 1e783e0e7b8..ef11e2c7aed 100644
--- a/source/blender/editors/transform/transform_convert.c
+++ b/source/blender/editors/transform/transform_convert.c
@@ -2399,10 +2399,6 @@ void createTransData(bContext *C, TransInfo *t)
     }
     countAndCleanTransDataContainer(t);
   }
-  else if (t->options & CTX_SCULPT) {
-    createTransSculpt(t);
-    countAndCleanTransDataContainer(t);
-  }
   else if (t->options & CTX_TEXTURE) {
     t->flag |= T_TEXTURE;
     t->obedit_type = -1;
@@ -2683,10 +2679,14 @@ void createTransData(bContext *C, TransInfo *t)
       createTransPaintCurveVerts(C, t);
       countAndCleanTransDataContainer(t);
     }
-    else {
+    else if (!(t->options & CTX_SCULPT)){
       has_transform_context = false;
     }
   }
+  else if (t->options & CTX_SCULPT) {
+    createTransSculpt(t);
+    countAndCleanTransDataContainer(t);
+  }
   else if ((ob) &&
            (ELEM(
                ob->mode, OB_MODE_PAINT_GPENCIL, OB_MODE_SCULPT_GPENCIL, OB_MODE_WEIGHT_GPENCIL))) {