diff --git a/frontend/app/(main)/admin/dashboard/DashboardListClient.tsx b/frontend/app/(main)/admin/dashboard/DashboardListClient.tsx
index d8eeae61..082e8661 100644
--- a/frontend/app/(main)/admin/dashboard/DashboardListClient.tsx
+++ b/frontend/app/(main)/admin/dashboard/DashboardListClient.tsx
@@ -300,7 +300,14 @@ export default function DashboardListClient({ initialDashboards, initialPaginati
               <TableBody>
                 {dashboards.map((dashboard) => (
                   <TableRow key={dashboard.id} className="hover:bg-muted/50 border-b transition-colors">
-                    <TableCell className="h-16 text-sm font-medium">{dashboard.title}</TableCell>
+                    <TableCell className="h-16 text-sm font-medium">
+                      <button
+                        onClick={() => router.push(`/admin/dashboard/edit/${dashboard.id}`)}
+                        className="hover:text-primary cursor-pointer text-left transition-colors hover:underline"
+                      >
+                        {dashboard.title}
+                      </button>
+                    </TableCell>
                     <TableCell className="text-muted-foreground h-16 max-w-md truncate text-sm">
                       {dashboard.description || "-"}
                     </TableCell>
@@ -355,7 +362,12 @@ export default function DashboardListClient({ initialDashboards, initialPaginati
                 {/* 헤더 */}
                 <div className="mb-4 flex items-start justify-between">
                   <div className="flex-1">
-                    <h3 className="text-base font-semibold">{dashboard.title}</h3>
+                    <button
+                      onClick={() => router.push(`/admin/dashboard/edit/${dashboard.id}`)}
+                      className="hover:text-primary cursor-pointer text-left transition-colors hover:underline"
+                    >
+                      <h3 className="text-base font-semibold">{dashboard.title}</h3>
+                    </button>
                     <p className="text-muted-foreground mt-1 text-sm">{dashboard.id}</p>
                   </div>
                 </div>
diff --git a/frontend/components/admin/dashboard/widget-sections/CustomMetricSection.tsx b/frontend/components/admin/dashboard/widget-sections/CustomMetricSection.tsx
index 6dbbb60c..97c0f395 100644
--- a/frontend/components/admin/dashboard/widget-sections/CustomMetricSection.tsx
+++ b/frontend/components/admin/dashboard/widget-sections/CustomMetricSection.tsx
@@ -89,68 +89,70 @@ export function CustomMetricSection({ queryResult, config, onConfigChange }: Cus
         </div>
 
         {config.filters && config.filters.length > 0 ? (
-          <div className="space-y-2">
+          <div className="space-y-3">
             {config.filters.map((filter, index) => (
-              <div key={index} className="bg-muted/50 flex items-center gap-2 rounded-md border p-2">
-                {/* 컬럼 선택 */}
-                <Select value={filter.column} onValueChange={(value) => updateFilter(index, "column", value)}>
-                  <SelectTrigger className="h-8 flex-1 text-xs">
-                    <SelectValue />
-                  </SelectTrigger>
-                  <SelectContent>
-                    {queryResult.columns.map((col) => (
-                      <SelectItem key={col} value={col} className="text-xs">
-                        {col}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
+              <div key={index} className="bg-muted/50 space-y-2 rounded-md border p-3">
+                {/* 첫 번째 줄: 컬럼 선택 */}
+                <div className="flex items-center gap-2">
+                  <Select value={filter.column} onValueChange={(value) => updateFilter(index, "column", value)}>
+                    <SelectTrigger className="h-9 flex-1 text-sm">
+                      <SelectValue placeholder="컬럼 선택" />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {queryResult.columns.map((col) => (
+                        <SelectItem key={col} value={col} className="text-sm">
+                          {col}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                  
+                  {/* 삭제 버튼 */}
+                  <Button onClick={() => removeFilter(index)} variant="ghost" size="icon" className="h-9 w-9 shrink-0">
+                    <X className="h-4 w-4" />
+                  </Button>
+                </div>
 
-                {/* 연산자 선택 */}
+                {/* 두 번째 줄: 연산자 선택 */}
                 <Select value={filter.operator} onValueChange={(value) => updateFilter(index, "operator", value)}>
-                  <SelectTrigger className="h-8 w-[100px] text-xs">
-                    <SelectValue />
+                  <SelectTrigger className="h-9 w-full text-sm">
+                    <SelectValue placeholder="연산자 선택" />
                   </SelectTrigger>
                   <SelectContent>
-                    <SelectItem value="=" className="text-xs">
+                    <SelectItem value="=" className="text-sm">
                       같음 (=)
                     </SelectItem>
-                    <SelectItem value="!=" className="text-xs">
+                    <SelectItem value="!=" className="text-sm">
                       다름 (≠)
                     </SelectItem>
-                    <SelectItem value=">" className="text-xs">
+                    <SelectItem value=">" className="text-sm">
                       큼 (&gt;)
                     </SelectItem>
-                    <SelectItem value="<" className="text-xs">
+                    <SelectItem value="<" className="text-sm">
                       작음 (&lt;)
                     </SelectItem>
-                    <SelectItem value=">=" className="text-xs">
+                    <SelectItem value=">=" className="text-sm">
                       크거나 같음 (≥)
                     </SelectItem>
-                    <SelectItem value="<=" className="text-xs">
+                    <SelectItem value="<=" className="text-sm">
                       작거나 같음 (≤)
                     </SelectItem>
-                    <SelectItem value="contains" className="text-xs">
+                    <SelectItem value="contains" className="text-sm">
                       포함
                     </SelectItem>
-                    <SelectItem value="not_contains" className="text-xs">
+                    <SelectItem value="not_contains" className="text-sm">
                       미포함
                     </SelectItem>
                   </SelectContent>
                 </Select>
 
-                {/* 값 입력 */}
+                {/* 세 번째 줄: 값 입력 */}
                 <Input
                   value={filter.value}
                   onChange={(e) => updateFilter(index, "value", e.target.value)}
-                  placeholder="값"
-                  className="h-8 flex-1 text-xs"
+                  placeholder="값을 입력하세요"
+                  className="h-9 w-full text-sm"
                 />
-
-                {/* 삭제 버튼 */}
-                <Button onClick={() => removeFilter(index)} variant="ghost" size="icon" className="h-8 w-8">
-                  <X className="h-3 w-3" />
-                </Button>
               </div>
             ))}
           </div>
@@ -264,7 +266,7 @@ export function CustomMetricSection({ queryResult, config, onConfigChange }: Cus
             <div className="space-y-1">
               <p className="text-xs font-medium">필터:</p>
               {config.filters.map((filter, idx) => (
-                <p key={idx} className="text-muted-foreground text-xs">
+                <p key={idx} className="text-muted-foreground text-xs" dir="ltr">
                   · {filter.column} {filter.operator} &quot;{filter.value}&quot;
                 </p>
               ))}