diff --git a/apps/nextjs/src/components/DialogControl/ContentOptions/ModalFooterButtons.tsx b/apps/nextjs/src/components/DialogControl/ContentOptions/ModalFooterButtons.tsx
index 6bfe8790a..71f4f4f74 100644
--- a/apps/nextjs/src/components/DialogControl/ContentOptions/ModalFooterButtons.tsx
+++ b/apps/nextjs/src/components/DialogControl/ContentOptions/ModalFooterButtons.tsx
@@ -23,7 +23,7 @@ const ModalFooterButtons = ({
       <OakLinkNoUnderline
         onClick={() => closeDialog()}
         element="button"
-        tabIndex={0}
+        tabIndex={1}
       >
         <OakSpan $font="body-2-bold" $color="black" $textDecoration="none">
           Cancel
diff --git a/apps/nextjs/src/components/Feedback/index.tsx b/apps/nextjs/src/components/Feedback/index.tsx
index a7ce96611..e89792236 100644
--- a/apps/nextjs/src/components/Feedback/index.tsx
+++ b/apps/nextjs/src/components/Feedback/index.tsx
@@ -130,7 +130,7 @@ const FeedBack = ({
                   {question.question}
                 </label>
                 <textarea
-                  tabIndex={0}
+                  tabIndex={1}
                   className="h-32 w-full min-w-[300px] rounded border-2 border-black p-10"
                   onChange={(e) => {
                     setUsersResponse({
@@ -146,7 +146,7 @@ const FeedBack = ({
         })}
         <div className="flex justify-center">
           <OakPrimaryButton
-            tabIndex={0}
+            tabIndex={1}
             onClick={() => {
               submitSurvey(usersResponse);
               onSubmit();