diff --git a/lib/ui/teacher_student_management_page.dart b/lib/ui/teacher_student_management_page.dart
index 4f49d60..02ca60d 100644
--- a/lib/ui/teacher_student_management_page.dart
+++ b/lib/ui/teacher_student_management_page.dart
@@ -767,9 +767,13 @@ class _TeacherStudentManagementPageState
                             ),
                           ),
                           const SizedBox(height: 12),
-                          Row(
+                          Wrap(
+                            crossAxisAlignment: WrapCrossAlignment.center,
+                            spacing: 6,
+                            runSpacing: 8,
                             children: [
-                              Expanded(
+                              SizedBox(
+                                width: isWide ? formSquareSize : 160,
                                 child: TextField(
                                   onChanged: _controller.setSearchQuery,
                                   keyboardType: TextInputType.number,
@@ -792,13 +796,9 @@ class _TeacherStudentManagementPageState
                                   ),
                                 ),
                               ),
-                              const SizedBox(width: 12),
                               _gradeFilterChip(null, '전체'),
-                              const SizedBox(width: 6),
                               _gradeFilterChip(1, '1학년'),
-                              const SizedBox(width: 6),
                               _gradeFilterChip(2, '2학년'),
-                              const SizedBox(width: 6),
                               _gradeFilterChip(3, '3학년'),
                             ],
                           ),