diff --git a/packages/tldraw/src/lib/shapes/arrow/components/ArrowTextLabel.tsx b/packages/tldraw/src/lib/shapes/arrow/components/ArrowTextLabel.tsx
index 41a1f0aca..6e28b98bb 100644
--- a/packages/tldraw/src/lib/shapes/arrow/components/ArrowTextLabel.tsx
+++ b/packages/tldraw/src/lib/shapes/arrow/components/ArrowTextLabel.tsx
@@ -76,6 +76,7 @@ export const ArrowTextLabel = React.memo(function ArrowTextLabel({
 						onChange={handleChange}
 						onKeyDown={handleKeyDown}
 						onBlur={handleBlur}
+						onTouchEnd={stopEventPropagation}
 						onContextMenu={stopEventPropagation}
 						onPointerDown={handleInputPointerDown}
 						onDoubleClick={handleDoubleClick}
diff --git a/packages/tldraw/src/lib/shapes/shared/TextLabel.tsx b/packages/tldraw/src/lib/shapes/shared/TextLabel.tsx
index 6eed41a09..f37d2dd0b 100644
--- a/packages/tldraw/src/lib/shapes/shared/TextLabel.tsx
+++ b/packages/tldraw/src/lib/shapes/shared/TextLabel.tsx
@@ -120,6 +120,7 @@ export const TextLabel = React.memo(function TextLabel<
 						onChange={handleChange}
 						onKeyDown={handleKeyDown}
 						onBlur={handleBlur}
+						onTouchEnd={stopEventPropagation}
 						onContextMenu={stopEventPropagation}
 						onPointerDown={handleInputPointerDown}
 						onDoubleClick={handleDoubleClick}
diff --git a/packages/tldraw/src/lib/shapes/text/TextShapeUtil.tsx b/packages/tldraw/src/lib/shapes/text/TextShapeUtil.tsx
index d88cda003..dfb51fb5c 100644
--- a/packages/tldraw/src/lib/shapes/text/TextShapeUtil.tsx
+++ b/packages/tldraw/src/lib/shapes/text/TextShapeUtil.tsx
@@ -118,11 +118,11 @@ export class TextShapeUtil extends ShapeUtil<TLTextShape> {
 							autoCapitalize="false"
 							autoCorrect="false"
 							autoSave="false"
-							autoFocus={isEditing}
+							autoFocus
 							placeholder=""
 							spellCheck="true"
 							wrap="off"
-							dir="ltr"
+							dir="auto"
 							datatype="wysiwyg"
 							defaultValue={text}
 							onFocus={handleFocus}