diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
index 27cb5728f5..2dad2dfd92 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
+++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
@@ -25,8 +25,8 @@
     <button #abpClose type="button" class="btn btn-secondary">
       {{ 'AbpFeatureManagement::Cancel' | abpLocalization }}
     </button>
-    <button type="button" class="btn btn-primary" (click)="save()">
+    <abp-button iconClass="fa fa-check" (click)="save()">
       {{ 'AbpFeatureManagement::Save' | abpLocalization }}
-    </button>
+    </abp-button>
   </ng-template>
 </abp-modal>
diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts
index b2ab6e71cf..38219b2b08 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts
@@ -11,7 +11,7 @@ import { pluck, tap } from 'rxjs/operators';
   selector: 'abp-feature-management',
   templateUrl: './feature-management.component.html',
 })
-export class FeatureManagementComponent implements OnChanges {
+export class FeatureManagementComponent {
   @Input()
   providerKey: string;
 
@@ -28,6 +28,8 @@ export class FeatureManagementComponent implements OnChanges {
   set visible(value: boolean) {
     this._visible = value;
     this.visibleChange.emit(value);
+
+    if (value) this.openModal();
   }
 
   @Output()
@@ -42,16 +44,6 @@ export class FeatureManagementComponent implements OnChanges {
 
   constructor(private store: Store) {}
 
-  ngOnChanges({ visible }: SimpleChanges): void {
-    if (!visible) return;
-
-    if (visible.currentValue) {
-      this.openModal();
-    } else if (this.visible && visible.currentValue === false) {
-      this.visible = false;
-    }
-  }
-
   openModal() {
     if (!this.providerKey || !this.providerName) {
       throw new Error('Provider Key and Provider Name are required.');
@@ -66,7 +58,6 @@ export class FeatureManagementComponent implements OnChanges {
       .pipe(pluck('FeatureManagementState', 'features'))
       .subscribe(features => {
         this.buildForm(features);
-        this.visible = true;
       });
   }