diff --git a/apps/cs/src/entities/site/ui/site-select.tsx b/apps/cs/src/entities/site/ui/site-select.tsx
index af2773958..61f412b4d 100644
--- a/apps/cs/src/entities/site/ui/site-select.tsx
+++ b/apps/cs/src/entities/site/ui/site-select.tsx
@@ -15,7 +15,6 @@ type SiteSelectProps = {
 } & React.ComponentPropsWithoutRef<typeof Select>;
 
 function SiteSelect({
-  siteId,
   defaultValue,
   placeholder = "선택",
   ...props
diff --git a/apps/cs/src/pages/code/model/table-columns.tsx b/apps/cs/src/pages/code/model/table-columns.tsx
index 1a486bd5a..f42f6463f 100644
--- a/apps/cs/src/pages/code/model/table-columns.tsx
+++ b/apps/cs/src/pages/code/model/table-columns.tsx
@@ -1,18 +1,40 @@
 import dayjs from "dayjs";
-import { type ColumnDef} from "@tanstack/react-table";
+import { type ColumnDef } from "@tanstack/react-table";
 import { Button } from "@common/components";
 import type { UpCode } from "@/entities/code/model/upcode-interface";
 import type { LwpoCode } from "@/entities/code/model/lwpocode-interface";
 
-type UpCodeTableMeta = {
-  onManagementClick?: (row: UpCode) => void;
+const UpCodeManageButton = () => {
+  return (
+    <Button
+      size="sm"
+      onClick={(e) => {
+        e.stopPropagation();
+        // 클릭 이벤트를 부모로 전파하여 onRowClick이 호출되도록 함
+        e.currentTarget.parentElement?.parentElement?.click();
+      }}
+    >
+      관리
+    </Button>
+  );
 };
 
-type LwpoCodeTableMeta = {
-  onManagementClick?: (row: LwpoCode) => void;
+const LwpoCodeManageButton = () => {
+  return (
+    <Button
+      size="sm"
+      onClick={(e) => {
+        e.stopPropagation();
+        // 클릭 이벤트를 부모로 전파하여 onRowClick이 호출되도록 함
+        e.currentTarget.parentElement?.parentElement?.click();
+      }}
+    >
+      관리
+    </Button>
+  );
 };
-  
-export const upCodecolumns: ColumnDef<UpCode, UpCodeTableMeta>[] = [
+
+export const upCodecolumns: ColumnDef<UpCode>[] = [
   {
     id: "no",
     header: "NO",
@@ -52,26 +74,13 @@ export const upCodecolumns: ColumnDef<UpCode, UpCodeTableMeta>[] = [
     },
   },
   {
-    id: "management",
+    id: "actions",
     header: "관리",
-    cell: ({ row, table }) => {
-      const onManagementClick = (table.options.meta as UpCodeTableMeta)?.onManagementClick;
-      return (
-        <Button
-          size="sm"
-          onClick={(e) => {
-            e.stopPropagation();
-            onManagementClick?.(row.original);
-          }}
-        >
-          관리
-        </Button>
-      );
-    },
-  },
+    cell: () => <UpCodeManageButton />,
+  }
 ];
 
-export const lowCodecolumns: ColumnDef<LwpoCode, LwpoCodeTableMeta>[] = [
+export const lowCodecolumns: ColumnDef<LwpoCode>[] = [
   {
     id: "no",
     header: "NO",
@@ -103,21 +112,8 @@ export const lowCodecolumns: ColumnDef<LwpoCode, LwpoCodeTableMeta>[] = [
     },
   },
   {
-    id: "management",
+    id: "actions",
     header: "관리",
-    cell: ({ row, table }) => {
-      const onManagementClick = (table.options.meta as LwpoCodeTableMeta)?.onManagementClick;
-      return (
-        <Button
-          size="sm"
-          onClick={(e) => {
-            e.stopPropagation();
-            onManagementClick?.(row.original);
-          }}
-        >
-          관리
-        </Button>
-      );
-    },
-  },
+    cell: () => <LwpoCodeManageButton />,
+  }
 ];
diff --git a/apps/cs/src/pages/code/ui/code-page.tsx b/apps/cs/src/pages/code/ui/code-page.tsx
index 4a4fa74da..237676c8a 100644
--- a/apps/cs/src/pages/code/ui/code-page.tsx
+++ b/apps/cs/src/pages/code/ui/code-page.tsx
@@ -68,22 +68,20 @@ function CodePage() {
         enabled: !!lwpoCodeQuery.upCd,
     });
 
-
     const upCodehandleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
       e.preventDefault();
       refetchUpCode();
     };
   
     const upCodehandleRowClick = (row: UpCode) => {
-      setSelectedUpCode(row);
-      setLwpoCodeQuery({ ...lwpoCodeQuery, upCd: row.upCd });
-      refetchLwpoCode();
-    };
-
-    const handleManagementClick = (row: UpCode) => {
-      setSelectedUpCode(row);
-      setIsRegistrationMode(false);
-      setIsManagementDialogOpen(true);
+      if (selectedUpCode?.upCd === row.upCd) {
+        setIsRegistrationMode(false);
+        setIsManagementDialogOpen(true);
+      } else {
+        setSelectedUpCode(row);
+        setLwpoCodeQuery({ ...lwpoCodeQuery, upCd: row.upCd });
+        refetchLwpoCode();
+      }
     };
 
     const handleRegistrationClick = () => {
@@ -92,7 +90,7 @@ function CodePage() {
       setIsManagementDialogOpen(true);
     };
 
-    const handleLwpoCodeManagementClick = (row: LwpoCode) => {
+    const lwpoCodehandleRowClick = (row: LwpoCode) => {
       setSelectedLwpoCode(row);
       setIsLwpoCodeRegistrationMode(false);
       setIsLwpoCodeManagementDialogOpen(true);
@@ -108,8 +106,7 @@ function CodePage() {
       setIsLwpoCodeManagementDialogOpen(true);
     };
  
- 
-    const upCodeTable = useReactTable({
+    const upCodeTable = useReactTable<UpCode>({
       data: upCodeList?.content ?? [],
       columns: upCodecolumns,
       rowCount: upCodeList?.totalElements ?? 0,
@@ -120,13 +117,10 @@ function CodePage() {
       onPaginationChange: setUpCodePagination,
       getCoreRowModel: getCoreRowModel(),
       manualPagination: true,
-      meta: {
-        onManagementClick: handleManagementClick,
-      },
       getRowId: (row) => row.upCd,
     });
 
-    const lwpoCodeTable = useReactTable({
+    const lwpoCodeTable = useReactTable<LwpoCode>({
         data: lwpoCodeList?.content ?? [],
         columns: lowCodecolumns,
         rowCount: lwpoCodeList?.totalElements ?? 0,
@@ -137,9 +131,6 @@ function CodePage() {
         onPaginationChange: setLwpoCodePagination,
         getCoreRowModel: getCoreRowModel(),
         manualPagination: true,
-        meta: {
-          onManagementClick: handleLwpoCodeManagementClick,
-        },
         getRowId: (row) => row.lwpoCd,
     });
   
@@ -218,6 +209,7 @@ function CodePage() {
               <div className="card !m-4 h-[calc(100vh-30rem)] overflow-auto !p-0">
                 <DataTable 
                   table={lwpoCodeTable} 
+                  onRowClick={lwpoCodehandleRowClick}
                 />
               </div>
             </div>
@@ -245,4 +237,5 @@ function CodePage() {
   }
   
   export { CodePage };
+  
   
\ No newline at end of file