diff --git a/adminfront/src/features/tenants/routes/TenantListPage.tsx b/adminfront/src/features/tenants/routes/TenantListPage.tsx
index f2a4bab4..148d78f0 100644
--- a/adminfront/src/features/tenants/routes/TenantListPage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantListPage.tsx
@@ -474,7 +474,7 @@ function TenantListPage() {
       </header>
 
       <Card className="bg-[var(--color-panel)] flex-1 flex flex-col min-h-0 overflow-hidden">
-        <CardHeader className="flex flex-row items-center justify-between flex-shrink-0">
+        <CardHeader className="flex flex-wrap items-end justify-between gap-4 flex-shrink-0">
           <div>
             <CardTitle>
               {t("ui.admin.tenants.registry.title", "Tenant Registry")}
@@ -485,9 +485,8 @@ function TenantListPage() {
               })}
             </CardDescription>
           </div>
-        </CardHeader>
-        <CardContent className="flex-1 flex flex-col min-h-0 pt-0">
-          <div className="mb-6 flex flex-wrap items-end gap-4 flex-shrink-0">
+          
+          <div className="flex items-end gap-4">
             <div className="relative flex-1 min-w-[240px] max-w-sm">
               <label className="text-xs font-medium text-muted-foreground mb-1.5 block">
                 {t("ui.admin.tenants.list.search_label", "테넌트 검색")}
@@ -506,6 +505,8 @@ function TenantListPage() {
               </div>
             </div>
           </div>
+        </CardHeader>
+        <CardContent className="flex-1 flex flex-col min-h-0 pt-0">
 
           {(errorMsg || fallbackError) && (
             <div className="mb-4 rounded-lg border border-destructive/40 bg-destructive/10 px-3 py-2 text-sm text-destructive flex-shrink-0">
diff --git a/adminfront/src/features/users/UserListPage.tsx b/adminfront/src/features/users/UserListPage.tsx
index 066352f8..84910bd9 100644
--- a/adminfront/src/features/users/UserListPage.tsx
+++ b/adminfront/src/features/users/UserListPage.tsx
@@ -465,10 +465,10 @@ function UserListPage() {
       </header>
 
       <Card className="flex-1 flex flex-col min-h-0 bg-[var(--color-panel)] overflow-hidden">
-        <CardHeader className="flex flex-row items-center justify-between flex-shrink-0">
+        <CardHeader className="flex flex-wrap items-end justify-between gap-4 flex-shrink-0">
           <div>
             <CardTitle>
-              {t("ui.admin.users.list.registry.title", "User Registry")}
+              {t("ui.admin.users.list.registry.title", "사용자 레지스트리")}
             </CardTitle>
             <CardDescription>
               {t(
@@ -478,9 +478,8 @@ function UserListPage() {
               )}
             </CardDescription>
           </div>
-        </CardHeader>
-        <CardContent className="flex-1 flex flex-col min-h-0 pt-0">
-          <div className="mb-6 flex flex-wrap items-end gap-4 flex-shrink-0">
+          
+          <div className="flex items-end gap-4">
             <div className="relative flex-1 min-w-[240px] max-w-sm">
               <label className="text-xs font-medium text-muted-foreground mb-1.5 block">
                 {t("ui.admin.users.list.search_label", "사용자 검색")}
@@ -530,6 +529,8 @@ function UserListPage() {
               {t("ui.common.search", "검색")}
             </Button>
           </div>
+        </CardHeader>
+        <CardContent className="flex-1 flex flex-col min-h-0 pt-0">
 
           {(errorMsg || fallbackError) && (
             <div className="mb-4 rounded-lg border border-destructive/40 bg-destructive/10 px-3 py-2 text-sm text-destructive flex-shrink-0">