diff --git a/src/element/textElement.ts b/src/element/textElement.ts
index fb145d169..e5c5d508e 100644
--- a/src/element/textElement.ts
+++ b/src/element/textElement.ts
@@ -98,13 +98,15 @@ export const redrawTextBoundingBox = (
       mutateElement(container, { height: nextHeight });
       updateOriginalContainerCache(container.id, nextHeight);
     }
-    const updatedTextElement = {
-      ...textElement,
-      ...boundTextUpdates,
-    } as ExcalidrawTextElementWithContainer;
-    const { x, y } = computeBoundTextPosition(container, updatedTextElement);
-    boundTextUpdates.x = x;
-    boundTextUpdates.y = y;
+    if (!isArrowElement(container)) {
+      const updatedTextElement = {
+        ...textElement,
+        ...boundTextUpdates,
+      } as ExcalidrawTextElementWithContainer;
+      const { x, y } = computeBoundTextPosition(container, updatedTextElement);
+      boundTextUpdates.x = x;
+      boundTextUpdates.y = y;
+    }
   }
 
   mutateElement(textElement, boundTextUpdates);
diff --git a/src/element/textWysiwyg.tsx b/src/element/textWysiwyg.tsx
index 63bc9e4a4..272434705 100644
--- a/src/element/textWysiwyg.tsx
+++ b/src/element/textWysiwyg.tsx
@@ -235,15 +235,12 @@ export const textWysiwyg = ({
         }
         // Start pushing text upward until a diff of 30px (padding)
         // is reached
-        else {
+        else if (!isArrowElement(container)) {
           const containerCoords = getContainerCoords(container);
 
           // vertically center align the text
           if (verticalAlign === VERTICAL_ALIGN.MIDDLE) {
-            if (!isArrowElement(container)) {
-              coordY =
-                containerCoords.y + maxHeight / 2 - textElementHeight / 2;
-            }
+            coordY = containerCoords.y + maxHeight / 2 - textElementHeight / 2;
           }
           if (verticalAlign === VERTICAL_ALIGN.BOTTOM) {
             coordY = containerCoords.y + (maxHeight - textElementHeight);