diff --git a/package-lock.json b/package-lock.json
index cdfd30c..be5c2a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3187,6 +3187,7 @@
         }
       }
     },
+
     "node_modules/@reown/appkit-pay": {
       "version": "1.7.8",
       "resolved": "https://registry.npmjs.org/@reown/appkit-pay/-/appkit-pay-1.7.8.tgz",
@@ -3544,6 +3545,7 @@
         }
       }
     },
+
     "node_modules/@reown/appkit-wallet": {
       "version": "1.7.8",
       "resolved": "https://registry.npmjs.org/@reown/appkit-wallet/-/appkit-wallet-1.7.8.tgz",
@@ -3853,6 +3855,7 @@
         }
       }
     },
+
     "node_modules/@rolldown/binding-android-arm64": {
       "version": "1.0.0-rc.17",
       "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.0-rc.17.tgz",
@@ -6523,6 +6526,7 @@
         }
       }
     },
+
     "node_modules/@walletconnect/window-getters": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@walletconnect/window-getters/-/window-getters-1.0.1.tgz",
diff --git a/src/pages/EditPdf/EditPdf.jsx b/src/pages/EditPdf/EditPdf.jsx
index 4c72d7e..66053b7 100644
--- a/src/pages/EditPdf/EditPdf.jsx
+++ b/src/pages/EditPdf/EditPdf.jsx
@@ -16,15 +16,17 @@ import { FREE_LIMITS, mbToBytes } from "../../config/limits";
 // ── constants ────────────────────────────────────────────────────────────────
 const RENDER_SCALE = 1.5;
 const ANN_TOOLS = [
-  { id: "draw",      label: "Draw"      },
-  { id: "text",      label: "Text"      },
-  { id: "highlight", label: "Highlight" },
-  { id: "rect",      label: "Rectangle" },
-  { id: "eraser",    label: "Eraser"    },
+  { id: "draw",      label: "Draw",      icon: Pencil },
+  { id: "text",      label: "Add Text Box",      icon: Type },
+  { id: "highlight", label: "Highlight", icon: Highlighter },
+  { id: "rect",      label: "Rectangle", icon: Square },
+  { id: "eraser",    label: "Eraser",    icon: Eraser },
 ];
 const COLORS = ["#ef4444","#f97316","#eab308","#22c55e","#3b82f6","#a855f7","#ec4899","#000000","#ffffff"];
-const HINTS  = { draw:"Click and drag freely", text:"Click to place a text box", highlight:"Drag to highlight an area", rect:"Drag to draw a rectangle", eraser:"Click any annotation to remove it" };
+const HINTS  = { draw:"Click and drag freely", text:"Click anywhere on the page to place a new text box", highlight:"Drag to highlight an area", rect:"Drag to draw a rectangle", eraser:"Click any annotation to remove it" };
 const CURSOR = { draw:"crosshair", text:"text", highlight:"crosshair", rect:"crosshair", eraser:"cell" };
+const TEXTBOX_PADDING_X = 4;
+const TEXTBOX_PADDING_Y = 2;
 
 // ── canvas helpers ────────────────────────────────────────────────────────────
 function drawAnn(ctx, ann) {
@@ -48,9 +50,7 @@ function drawAnn(ctx, ann) {
       ctx.strokeRect(x, y, Math.abs((ann.x2??ann.x)-ann.x), Math.abs((ann.y2??ann.y)-ann.y)); break;
     }
     case "text":
-      ctx.globalAlpha = ann.opacity ?? 1;
-      ctx.font = `${ann.fontSize??18}px sans-serif`;
-      ctx.fillText(ann.text, ann.x, ann.y); break;
+      break;
   }
   ctx.restore();
 }
@@ -59,11 +59,14 @@ function hitTest(ann, x, y) {
   const R = Math.max(10, (ann.strokeWidth??2)*3);
   switch (ann.type) {
     case "draw": return ann.points?.some(p => Math.hypot(p.x-x, p.y-y) < R);
-    case "text": { const fs = ann.fontSize??18; return x>=ann.x-4 && x<=ann.x+ann.text.length*fs*0.6 && y>=ann.y-fs && y<=ann.y+4; }
+    case "text": { const fs = ann.fontSize??18; return x>=ann.x-4 && x<=ann.x+ann.text.length*fs*0.6 && y>=ann.y-4 && y<=ann.y+fs+4; }
     default: return x>=Math.min(ann.x,ann.x2??ann.x)-4&&x<=Math.max(ann.x,ann.x2??ann.x)+4&&y>=Math.min(ann.y,ann.y2??ann.y)-4&&y<=Math.max(ann.y,ann.y2??ann.y)+4;
   }
 }
 function getPos(e, el) { const r = el.getBoundingClientRect(); return { x: e.clientX-r.left, y: e.clientY-r.top }; }
+function isFormTarget(target) {
+  return target instanceof HTMLElement && ["TEXTAREA", "INPUT", "BUTTON"].includes(target.tagName);
+}
 
 // ── component ─────────────────────────────────────────────────────────────────
 export function EditPdf() {
@@ -93,6 +96,8 @@ export function EditPdf() {
 
   const canvasRefs = useRef({});
   const drawing    = useRef(null);
+  const draggingText = useRef(null);
+  const skipTextPlacement = useRef(false);
 
   const { isPremium, isWalletConnected: isConn, hasReachedGlobalLimit, incrementUsage } = useSubscription();
   const LIMIT_MB   = FREE_LIMITS.editPdf.maxFileSizeMb;
@@ -169,15 +174,45 @@ export function EditPdf() {
     });
 
     // ── 2. Draw annotation strokes on top ────────────────────────────────────
-    annotations.filter(a => a.pageIndex === pi).forEach(a => drawAnn(ctx, a));
+    annotations.filter(a => a.pageIndex === pi && a.type !== "text").forEach(a => drawAnn(ctx, a));
     if (inProgress) drawAnn(ctx, inProgress);
   }
 
   // ── annotation mouse handlers ────────────────────────────────────────────────
+  function openTextBox(pi, pos) {
+    setTextBox({
+      pageIndex: pi,
+      x: Math.max(8, pos.x),
+      y: Math.max(8, pos.y),
+      value: "",
+    });
+  }
+  function removeAnnotation(id) {
+    setAnnotations(prev => prev.filter(ann => ann.id !== id));
+  }
+  function startTextDrag(e, ann) {
+    if (mode !== "annotate") return;
+    if (tool === "eraser") {
+      e.stopPropagation();
+      removeAnnotation(ann.id);
+      return;
+    }
+    if (tool !== "text") return;
+    const pos = getPos(e, canvasRefs.current[ann.pageIndex]);
+    draggingText.current = {
+      id: ann.id,
+      pageIndex: ann.pageIndex,
+      offsetX: pos.x - ann.x,
+      offsetY: pos.y - ann.y,
+    };
+    skipTextPlacement.current = true;
+    e.stopPropagation();
+  }
+
   function onMouseDown(e, pi) {
     if (mode !== "annotate") return;
     const pos = getPos(e, canvasRefs.current[pi]);
-    if (tool === "text") { setTextBox({ pageIndex: pi, x: pos.x, y: pos.y, value: "" }); return; }
+    if (tool === "text") return;
     if (tool === "eraser") {
       setAnnotations(prev => {
         const idx = [...prev].reverse().findIndex(a => a.pageIndex === pi && hitTest(a, pos.x, pos.y));
@@ -186,7 +221,26 @@ export function EditPdf() {
     }
     drawing.current = { pageIndex: pi, type: tool, color, strokeWidth: stroke, opacity, x: pos.x, y: pos.y, x2: pos.x, y2: pos.y, points: [pos] };
   }
+  function onPageClick(e, pi) {
+    if (skipTextPlacement.current) {
+      skipTextPlacement.current = false;
+      return;
+    }
+    if (mode !== "annotate" || tool !== "text" || textBox || isFormTarget(e.target)) return;
+    const holder = e.currentTarget;
+    openTextBox(pi, getPos(e, holder));
+  }
   function onMouseMove(e, pi) {
+    if (draggingText.current?.pageIndex === pi) {
+      const pos = getPos(e, canvasRefs.current[pi]);
+      const { id, offsetX, offsetY } = draggingText.current;
+      setAnnotations(prev => prev.map(ann => (
+        ann.id === id
+          ? { ...ann, x: Math.max(8, pos.x - offsetX), y: Math.max(8, pos.y - offsetY) }
+          : ann
+      )));
+      return;
+    }
     if (!drawing.current || drawing.current.pageIndex !== pi) return;
     const pos = getPos(e, canvasRefs.current[pi]);
     drawing.current.x2 = pos.x; drawing.current.y2 = pos.y;
@@ -194,15 +248,35 @@ export function EditPdf() {
     redraw(pi, drawing.current);
   }
   function onMouseUp(e, pi) {
+    if (draggingText.current?.pageIndex === pi) {
+      draggingText.current = null;
+      return;
+    }
     if (!drawing.current || drawing.current.pageIndex !== pi) return;
     const d = drawing.current; drawing.current = null;
     const ok = d.type === "draw" ? d.points.length >= 2 : Math.abs(d.x2-d.x) > 3 || Math.abs(d.y2-d.y) > 3;
     if (ok) setAnnotations(prev => [...prev, { ...d, id: Date.now() }]); else redraw(pi, null);
   }
-  function commitTextBox() {
-    if (!textBox) return;
-    if (textBox.value.trim()) setAnnotations(prev => [...prev, { id: Date.now(), type: "text", pageIndex: textBox.pageIndex, x: textBox.x, y: textBox.y + fontSize, text: textBox.value, color, fontSize, opacity, strokeWidth: 1 }]);
-    setTextBox(null);
+  function commitTextBox(nextValue) {
+    setTextBox(current => {
+      if (!current) return null;
+      const value = typeof nextValue === "string" ? nextValue : current.value;
+      if (value.trim()) {
+        setAnnotations(prev => [...prev, {
+          id: Date.now(),
+          type: "text",
+          pageIndex: current.pageIndex,
+          x: current.x + TEXTBOX_PADDING_X,
+          y: current.y + TEXTBOX_PADDING_Y,
+          text: value,
+          color,
+          fontSize,
+          opacity,
+          strokeWidth: 1,
+        }]);
+      }
+      return null;
+    });
   }
 
   // ── save PDF (applies both annotations and text edits) ──────────────────────
@@ -241,7 +315,7 @@ export function EditPdf() {
           <FileEdit className="w-10 h-10" />
         </Motion.div>
         <h1 className="text-5xl font-black text-white mb-4 tracking-tighter uppercase">Edit PDF</h1>
-        <p className="text-zinc-500 text-lg font-light max-w-md mx-auto">Draw, annotate, highlight — or click existing text to edit it directly in the browser.</p>
+        <p className="text-zinc-500 text-lg font-light max-w-md mx-auto">Add text boxes, draw, and annotate your PDF pages — or switch modes to edit existing text already in the file.</p>
       </div>
       {error && <div className="mb-6 p-4 bg-red-500/10 text-red-400 rounded-2xl border border-red-500/20 text-sm">{error}</div>}
       <Dropzone onFilesSelected={fs => { const f = fs[0]; if (f) { setFile(f); loadFile(f); } }} multiple={false} text="Drop a PDF to start editing" />
@@ -275,7 +349,7 @@ export function EditPdf() {
             <Pencil className="w-3 h-3" /> Annotate
           </button>
           <button onClick={() => setMode("edittext")} className={`px-3 py-1.5 rounded-lg text-xs font-semibold transition-all flex items-center gap-1.5 ${mode==="edittext"?"bg-white text-black":"text-zinc-400 hover:text-white"}`}>
-            <PenLine className="w-3 h-3" /> Edit Text
+            <PenLine className="w-3 h-3" /> Edit Existing Text
           </button>
         </div>
 
@@ -283,10 +357,10 @@ export function EditPdf() {
         {mode === "annotate" && <>
           <div className="h-4 w-px bg-white/10" />
           <div className="flex gap-1">
-            {ANN_TOOLS.map(({ id, label }) => (
-              <button key={id} title={label} onClick={() => setTool(id)}
+            {ANN_TOOLS.map(({ id, label, icon }) => (
+              <button key={id} type="button" aria-label={label} aria-pressed={tool===id} title={label} onClick={() => setTool(id)}
                 className={`p-2 rounded-xl transition-all ${tool===id?"bg-white text-black":"text-zinc-400 hover:text-white hover:bg-white/10"}`}>
-                
+                {React.createElement(icon, { className: "w-4 h-4" })}
               </button>
             ))}
           </div>
@@ -301,6 +375,12 @@ export function EditPdf() {
               onChange={e => tool==="text"?setFontSize(+e.target.value):setStroke(+e.target.value)} className="w-16 accent-white" />
             <span className="text-xs text-zinc-300 w-5">{tool==="text"?fontSize:stroke}</span>
           </div>
+          {tool === "text" && (
+            <div className="flex items-center gap-2 text-xs text-zinc-500">
+              <Info className="w-3.5 h-3.5 text-zinc-600 shrink-0" />
+              <span>This adds a new text box. Click on the page to place it, then drag the placed text to adjust.</span>
+            </div>
+          )}
         </>}
 
         {/* Edit text mode info */}
@@ -351,7 +431,15 @@ export function EditPdf() {
       {/* ── Page area ── */}
       <div className="flex flex-col items-center gap-10 py-10 px-4 overflow-x-auto">
         {pages.map((page, pi) => (
-          <div key={pi} className="relative shadow-2xl rounded overflow-hidden border border-white/10" style={{ width: page.width, height: page.height }}>
+          <div
+            key={pi}
+            className="relative shadow-2xl rounded overflow-hidden border border-white/10"
+            style={{ width: page.width, height: page.height }}
+            onClick={e => onPageClick(e, pi)}
+            onMouseMove={e => onMouseMove(e, pi)}
+            onMouseUp={e => onMouseUp(e, pi)}
+            onMouseLeave={e => onMouseUp(e, pi)}
+          >
 
             <div className="absolute top-2 left-2 z-10 bg-black/60 text-zinc-400 text-xs px-2 py-0.5 rounded-full pointer-events-none">
               Page {pi + 1}
@@ -370,6 +458,35 @@ export function EditPdf() {
               onMouseLeave={e => onMouseUp(e, pi)}
             />
 
+            {annotations.filter(a => a.pageIndex === pi && a.type === "text").map(ann => (
+              <div
+                key={ann.id}
+                onMouseDown={e => startTextDrag(e, ann)}
+                onClick={e => {
+                  if (mode === "annotate" && tool === "eraser") {
+                    e.stopPropagation();
+                    removeAnnotation(ann.id);
+                  }
+                }}
+                style={{
+                  position:"absolute",
+                  left:ann.x,
+                  top:ann.y,
+                  color:ann.color,
+                  fontSize:ann.fontSize,
+                  fontFamily:"sans-serif",
+                  lineHeight:1.2,
+                  whiteSpace:"pre-wrap",
+                  cursor: mode === "annotate" && tool === "text" ? "move" : mode === "annotate" && tool === "eraser" ? "cell" : "default",
+                  pointerEvents: mode === "annotate" && (tool === "text" || tool === "eraser") ? "auto" : "none",
+                  zIndex:12,
+                  userSelect:"none",
+                }}
+              >
+                {ann.text}
+              </div>
+            ))}
+
             {/* Text item overlays (Edit Text mode) */}
             {mode === "edittext" && textItems.filter(t => t.pageIndex === pi).map(item => {
               const isEditing  = editingId === item.id;
@@ -413,9 +530,10 @@ export function EditPdf() {
             {textBox?.pageIndex === pi && (
               <textarea autoFocus value={textBox.value}
                 onChange={e => setTextBox(t => ({ ...t, value: e.target.value }))}
-                onKeyDown={e => { if (e.key==="Enter" && !e.shiftKey) { commitTextBox(); e.preventDefault(); } if (e.key==="Escape") setTextBox(null); }}
-                onBlur={commitTextBox}
-                style={{ position:"absolute", left:textBox.x, top:textBox.y - fontSize, background:"transparent", border:"1px dashed rgba(255,255,255,0.4)", color, fontSize, fontFamily:"sans-serif", lineHeight:1.2, outline:"none", resize:"none", padding:"2px 4px", minWidth:80, minHeight:fontSize+8 }}
+                onKeyDown={e => { if (e.key==="Enter" && !e.shiftKey) { commitTextBox(e.currentTarget.value); e.preventDefault(); } if (e.key==="Escape") setTextBox(null); }}
+                onBlur={e => commitTextBox(e.currentTarget.value)}
+                placeholder="Type text and press Enter"
+                style={{ position:"absolute", left:textBox.x, top:textBox.y, background:"rgba(0,0,0,0.82)", border:"1px dashed rgba(255,255,255,0.4)", color, caretColor: color, fontSize, fontFamily:"sans-serif", lineHeight:1.2, outline:"none", resize:"none", padding:`${TEXTBOX_PADDING_Y}px ${TEXTBOX_PADDING_X}px`, minWidth:80, minHeight:fontSize + TEXTBOX_PADDING_Y * 2 + 4, zIndex:15 }}
               />
             )}
           </div>
diff --git a/src/pages/EditPdf/EditPdf.test.jsx b/src/pages/EditPdf/EditPdf.test.jsx
new file mode 100644
index 0000000..a77d29b
--- /dev/null
+++ b/src/pages/EditPdf/EditPdf.test.jsx
@@ -0,0 +1,175 @@
+import React from "react";
+import { render, screen, fireEvent } from "@testing-library/react";
+import "@testing-library/jest-dom/vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { EditPdf } from "./EditPdf";
+import { applyEdits } from "../../services/pdf.service";
+
+vi.mock("../../hooks/useSubscription", () => ({
+  useSubscription: () => ({
+    isPremium: true,
+    isWalletConnected: false,
+    hasReachedGlobalLimit: false,
+    incrementUsage: vi.fn(),
+  }),
+}));
+
+vi.mock("../../services/pdf.service", () => ({
+  applyEdits: vi.fn(async () => new Blob(["pdf"], { type: "application/pdf" })),
+  editPdfText: vi.fn(),
+}));
+
+vi.mock("../../components/pdf/Dropzone", () => ({
+  Dropzone: () => <div data-testid="dropzone" />,
+}));
+
+vi.mock("pdfjs-dist", () => ({}));
+
+vi.mock("../../hooks/useFileStore", async () => {
+  const ReactModule = await import("react");
+
+  const initialState = {
+    EditPdf_file: new File(["pdf"], "sample.pdf", { type: "application/pdf" }),
+    EditPdf_pages: [
+      { imageData: "data:image/png;base64,abc", width: 320, height: 480, pdfWidth: 320, pdfHeight: 480 },
+    ],
+    EditPdf_textItems: [],
+    EditPdf_annotations: [],
+    EditPdf_textEdits: {},
+  };
+
+  return {
+    useFileStore: (key, fallback) => {
+      const [value, setValue] = ReactModule.useState(
+        Object.prototype.hasOwnProperty.call(initialState, key) ? initialState[key] : fallback
+      );
+      const clearValue = () => setValue(fallback);
+      return [value, setValue, clearValue];
+    },
+  };
+});
+
+describe("EditPdf", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    HTMLCanvasElement.prototype.getContext = vi.fn(() => ({
+      clearRect: vi.fn(),
+      save: vi.fn(),
+      restore: vi.fn(),
+      beginPath: vi.fn(),
+      moveTo: vi.fn(),
+      lineTo: vi.fn(),
+      stroke: vi.fn(),
+      fillRect: vi.fn(),
+      strokeRect: vi.fn(),
+      fillText: vi.fn(),
+      set strokeStyle(_) {},
+      set fillStyle(_) {},
+      set lineWidth(_) {},
+      set lineCap(_) {},
+      set lineJoin(_) {},
+      set globalAlpha(_) {},
+      set font(_) {},
+      set textBaseline(_) {},
+    }));
+  });
+
+  it("shows the add-text tool and lets users place a new text box annotation", () => {
+    const { container } = render(<EditPdf />);
+
+    const textTool = screen.getByLabelText("Add Text Box");
+    expect(textTool).toBeInTheDocument();
+    expect(textTool).toHaveAttribute("aria-pressed", "false");
+
+    fireEvent.click(textTool);
+    expect(textTool).toHaveAttribute("aria-pressed", "true");
+    expect(screen.getByText(/this adds a new text box/i)).toBeInTheDocument();
+    const canvas = container.querySelector("canvas");
+    expect(canvas).not.toBeNull();
+
+    fireEvent.click(canvas, { clientX: 80, clientY: 120 });
+
+    const textbox = container.querySelector("textarea");
+    expect(textbox).not.toBeNull();
+
+    fireEvent.change(textbox, { target: { value: "Hello PDF" } });
+    fireEvent.keyDown(textbox, { key: "Enter" });
+
+    expect(container.querySelector("textarea")).toBeNull();
+    expect(screen.getByText("1 edit")).toBeInTheDocument();
+  });
+
+  it("saves a placed text box through annotation export", async () => {
+    const { container } = render(<EditPdf />);
+
+    fireEvent.click(screen.getByLabelText("Add Text Box"));
+    fireEvent.click(container.querySelector("canvas"), { clientX: 80, clientY: 120 });
+
+    const textbox = container.querySelector("textarea");
+    fireEvent.change(textbox, { target: { value: "Hello PDF" } });
+    fireEvent.keyDown(textbox, { key: "Enter" });
+
+    fireEvent.click(screen.getByRole("button", { name: /save pdf/i }));
+
+    expect(applyEdits).toHaveBeenCalledWith(
+      expect.any(File),
+      [
+        expect.objectContaining({
+          type: "text",
+          text: "Hello PDF",
+          pageIndex: 0,
+          y: expect.any(Number),
+        }),
+      ],
+      expect.any(Array),
+    );
+  });
+
+  it("commits a new text box when the field loses focus", () => {
+    const { container } = render(<EditPdf />);
+
+    fireEvent.click(screen.getByLabelText("Add Text Box"));
+    fireEvent.click(container.querySelector("canvas"), { clientX: 120, clientY: 160 });
+
+    const textbox = container.querySelector("textarea");
+    fireEvent.change(textbox, { target: { value: "Blur save" } });
+    fireEvent.blur(textbox, { target: { value: "Blur save" } });
+
+    expect(container.querySelector("textarea")).toBeNull();
+    expect(screen.getByText("1 edit")).toBeInTheDocument();
+  });
+
+  it("lets users drag a placed text annotation to adjust its position", () => {
+    const { container } = render(<EditPdf />);
+
+    fireEvent.click(screen.getByLabelText("Add Text Box"));
+    fireEvent.click(container.querySelector("canvas"), { clientX: 120, clientY: 160 });
+
+    const textbox = container.querySelector("textarea");
+    fireEvent.change(textbox, { target: { value: "Move me" } });
+    fireEvent.keyDown(textbox, { key: "Enter" });
+
+    const placedText = screen.getByText("Move me");
+    fireEvent.mouseDown(placedText, { clientX: 126, clientY: 164 });
+    fireEvent.mouseMove(container.querySelector("canvas"), { clientX: 180, clientY: 210 });
+    fireEvent.mouseUp(container.querySelector("canvas"), { clientX: 180, clientY: 210 });
+    fireEvent.click(screen.getByRole("button", { name: /save pdf/i }));
+
+    expect(applyEdits).toHaveBeenCalledWith(
+      expect.any(File),
+      [
+        expect.objectContaining({
+          type: "text",
+          text: "Move me",
+          x: expect.any(Number),
+          y: expect.any(Number),
+        }),
+      ],
+      expect.any(Array),
+    );
+
+    const movedAnnotation = applyEdits.mock.calls.at(-1)[1][0];
+    expect(movedAnnotation.x).toBeGreaterThan(120);
+    expect(movedAnnotation.y).toBeGreaterThan(160);
+  });
+});
diff --git a/src/services/pdf.service.js b/src/services/pdf.service.js
index 93a0502..d328e2b 100644
--- a/src/services/pdf.service.js
+++ b/src/services/pdf.service.js
@@ -492,7 +492,7 @@ export const applyEdits = async (file, annotations, pages) => {
       case "text": {
         const ptSize = (ann.fontSize ?? 18) * sx;
         pdfPage.drawText(ann.text, {
-          x: toX(ann.x), y: toY(ann.y),
+          x: toX(ann.x), y: toY(ann.y + (ann.fontSize ?? 18)),
           size: Math.max(4, ptSize), font, color: clr, opacity: ann.opacity ?? 1,
         });
         break;