diff --git a/src/_components/boxChart/BoxDoughnutChar.js b/src/_components/boxChart/BoxDoughnutChar.js
index 464e2ee..a20cc9d 100644
--- a/src/_components/boxChart/BoxDoughnutChar.js
+++ b/src/_components/boxChart/BoxDoughnutChar.js
@@ -19,11 +19,11 @@ export default function BoxDoughnutChart({data = [], title, propsContainer}) {
   return (
     <div className="box-chart-container" {...propsContainer}>
       <p className='box-chart-subtitle' style={{ marginBottom: '1.2rem'}}>{title}</p>
-      <div className='' style={{display: 'flex', justifyContent: 'center', alignItems: 'center'}}>
-        <div className='doughnut-chart-content'>
+      <div className='d-flex flex-1'>
+        <div className='doughnut-chart-content flex-1'>
           <RDoughnutChart data={data} />
         </div>
-        <div className='origin-vertical justify-content-center align-item-center' style={{display: 'flex'}}>
+        <div className='origin-vertical justify-content-center align-item-center flex-1'>
           {renderStats()}
         </div>
       </div>
diff --git a/src/_screens/home/detail-room-education/index.js b/src/_screens/home/detail-room-education/index.js
index 0798d7a..46a9829 100644
--- a/src/_screens/home/detail-room-education/index.js
+++ b/src/_screens/home/detail-room-education/index.js
@@ -38,6 +38,7 @@ export default function DetailRoomEducation() {
   const [isLoadingStatisticCircle, setIsLoadingStatisticCircle] = useState(false);
   const [isLoadingStudentChart, setIsLoadingStudentChart] = useState(false);
   const [isLoadingTeacherChart, setIsLoadingTeacherChart] = useState(false);
+  const [isFilterChanged, setIsFilterChanged] = useState(false);
   const [isLoadMoreOnline, setLoadMoreOnline] = useState(true);
   const [limitOnline] = useState(10);
   const [offsetOnline, setOffsetOnline] = useState(0);
@@ -431,12 +432,12 @@ export default function DetailRoomEducation() {
                     }}
                     />
                     <PrimaryButton
-                      isDisabled={false}
+                      isDisabled={searchText.length === 0}
                       onClick={handleSubmit}
                     >
                       {"Tìm kiếm"}
                     </PrimaryButton>
-                    <PrimaryButton onClick={handleExport}>
+                    <PrimaryButton isDisabled={listOrganization.length === 0} onClick={handleExport}>
                       Xuất excel
                     </PrimaryButton>
                 </div>
@@ -445,22 +446,34 @@ export default function DetailRoomEducation() {
                 <RootSelect
                   data={LIST_SCHOOL_YEAR}
                   value={schoolYear}
-                  setValue={setSchoolYear}
+                  setValue={(value) => {
+                    setSchoolYear(value);
+                    setIsFilterChanged(true);
+                  }}
                   style={{flex: 1, minWidth: '200px', padding:'0 10px'}}
                 />
                 <RootSelect
                   data={LIST_SEMESTER}
                   value={semester}
-                  setValue={changeSemester}
+                  setValue={(value) => {
+                    changeSemester(value);
+                    setIsFilterChanged(true);
+                  }}
                   style={{flex: 0.5, minWidth: '151px', padding:'0 10px'}}
                 />
                 <RootSelect
                   data={getListMonthBySemester(semester.value)}
                   value={month}
-                  setValue={setMonth}
+                  setValue={(value) => {
+                    setMonth(value);
+                    setIsFilterChanged(true);
+                  }}
                   style={{flex: 0.5, minWidth: '150px', padding:'0 10px'}}
                 />
-                <PrimaryButton onClick={handleFilter}>
+                <PrimaryButton isDisabled={!isFilterChanged} onClick={() => {
+                  handleFilter();
+                  setIsFilterChanged(false);
+                }}>
                   Áp dụng
                 </PrimaryButton>
               </div>
diff --git a/src/_screens/home/education-department/index.js b/src/_screens/home/education-department/index.js
index e20b27c..f259374 100644
--- a/src/_screens/home/education-department/index.js
+++ b/src/_screens/home/education-department/index.js
@@ -273,7 +273,7 @@ export default function EducationDepartmentHome() {
                   />
               <div style={{paddingTop: 10}}>
                 <PrimaryButton
-                  isDisabled={false}
+                  isDisabled={searchText.length === 0}
                   onClick={handleSubmit}
                   >
                   {"Tìm kiếm"}