diff --git a/apps/nextjs/src/app/[locale]/boards/(content)/_edit-actions.tsx b/apps/nextjs/src/app/[locale]/boards/(content)/_edit-actions.tsx
index 8b074d913..29dbc8ac0 100644
--- a/apps/nextjs/src/app/[locale]/boards/(content)/_edit-actions.tsx
+++ b/apps/nextjs/src/app/[locale]/boards/(content)/_edit-actions.tsx
@@ -21,9 +21,17 @@ export default function BoardEditActions() {
   return <AddMenu />;
 }
 
-export const InitialBoardAddAction = () => {
+const AddMenu = () => {
+  const { data: session } = useSession();
   const board = useRequiredBoard();
   const { openModal: openItemSelectModal } = useModalAction(ItemSelectModal);
+  const { openModal: openAppSelectModal } = useModalAction(AppSelectModal);
+  const { openModal: openIntegrationSelectModal } = useModalAction(IntegrationSelectModal);
+  const { addContainer } = useContainerActions();
+  const { createItem } = useItemActions();
+  const tBoard = useI18n("board");
+  const tIntegration = useI18n("integration");
+  const tContainer = useI18n("section.container");
   const pathname = usePathname();
   const router = useRouter();
   const searchParams = useSearchParams();
@@ -40,21 +48,6 @@ export const InitialBoardAddAction = () => {
     router.replace(query ? `${pathname}?${query}` : pathname, { scroll: false });
   }, [board.id, openItemSelectModal, pathname, router, searchParams]);
 
-  return null;
-};
-
-const AddMenu = () => {
-  const { data: session } = useSession();
-  const board = useRequiredBoard();
-  const { openModal: openItemSelectModal } = useModalAction(ItemSelectModal);
-  const { openModal: openAppSelectModal } = useModalAction(AppSelectModal);
-  const { openModal: openIntegrationSelectModal } = useModalAction(IntegrationSelectModal);
-  const { addContainer } = useContainerActions();
-  const { createItem } = useItemActions();
-  const tBoard = useI18n("board");
-  const tIntegration = useI18n("integration");
-  const tContainer = useI18n("section.container");
-
   const handleSelectItem = () => {
     openItemSelectModal({ boardId: board.id });
   };
diff --git a/apps/nextjs/src/app/[locale]/boards/(content)/_header-actions.tsx b/apps/nextjs/src/app/[locale]/boards/(content)/_header-actions.tsx
index c09102006..41552ff34 100644
--- a/apps/nextjs/src/app/[locale]/boards/(content)/_header-actions.tsx
+++ b/apps/nextjs/src/app/[locale]/boards/(content)/_header-actions.tsx
@@ -38,26 +38,16 @@ const loadBoardEditorAsync = async () =>
     import("~/components/board/sections/container/container-menu"),
   ]);
 const BoardEditActions = dynamic(loadEditActionsAsync, { ssr: false });
-const InitialBoardAddAction = dynamic(
-  async () => {
-    const editActions = await loadEditActionsAsync();
-    return editActions.InitialBoardAddAction;
-  },
-  { ssr: false },
-);
 
 export const BoardContentEditAction = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
   const [isEditMode] = useEditMode();
   const board = useRequiredBoard();
-  const searchParams = useSearchParams();
   const { hasChangeAccess } = useBoardPermissions(board);
-  const shouldOpenInitialAdd = searchParams.get("add") === "true";
 
   if (!hasChangeAccess) return null;
 
   return (
     <>
-      {shouldOpenInitialAdd && <InitialBoardAddAction />}
       {isEditMode && <BoardEditActions />}
       <EditModeMenu demoReadOnly={demoReadOnly} />
     </>
diff --git a/packages/forms-collection/src/board-create/board-create-form.tsx b/packages/forms-collection/src/board-create/board-create-form.tsx
index 828db7b23..ccfa17440 100644
--- a/packages/forms-collection/src/board-create/board-create-form.tsx
+++ b/packages/forms-collection/src/board-create/board-create-form.tsx
@@ -49,7 +49,7 @@ export const BoardCreateForm = ({ onCancel }: BoardCreateFormProps) => {
               message: tBoard("action.create.notification.success.message", { name: values.name }),
             });
             const name = encodeURIComponent(result.name);
-            router.push(`/boards/${name}?add=true`);
+            router.push(`/boards/${name}`);
           },
           onError() {
             showErrorNotification({
diff --git a/packages/modals/src/modal-form-footer.tsx b/packages/modals/src/modal-form-footer.tsx
index c204b000a..8927ee081 100644
--- a/packages/modals/src/modal-form-footer.tsx
+++ b/packages/modals/src/modal-form-footer.tsx
@@ -21,15 +21,15 @@ const ActionButtons = ({
   loading,
   form,
 }: Pick<ModalFormFooterProps, "onCancel" | "submitLabel" | "cancelLabel" | "loading" | "form">) => {
-  const t = useI18n();
+  const t = useI18n("common.action");
 
   return (
     <>
       <Button onClick={onCancel} variant="subtle" color="gray">
-        {cancelLabel ?? t("common.action.cancel")}
+        {cancelLabel ?? t("cancel")}
       </Button>
       <Button type="submit" form={form} loading={loading}>
-        {submitLabel ?? t("common.action.saveChanges")}
+        {submitLabel ?? t("saveChanges")}
       </Button>
     </>
   );