diff --git a/resources/views/admin/data-config/accounts.blade.php b/resources/views/admin/data-config/accounts.blade.php
index ed617ec..be28679 100644
--- a/resources/views/admin/data-config/accounts.blade.php
+++ b/resources/views/admin/data-config/accounts.blade.php
@@ -159,7 +159,7 @@ $roleSelectConfig = [
                     </div>
 
                     @if(auth()->user()->isSystemAdmin())
-                    <div class="space-y-2 relative z-30">
+                    <div class="space-y-2 relative z-10 focus-within:z-30">
                         <label class="text-xs font-black text-slate-500 uppercase tracking-widest pl-1">{{ __('Affiliation') }}</label>
                         <x-searchable-select id="modal-account-company" name="company_id"
                             placeholder="{{ __('SYSTEM') }}" x-model="currentUser.company_id"
@@ -171,7 +171,7 @@ $roleSelectConfig = [
                     </div>
                     @endif
 
-                    <div class="grid grid-cols-1 md:grid-cols-2 gap-6 relative z-20">
+                    <div class="grid grid-cols-1 md:grid-cols-2 gap-6 relative z-10 focus-within:z-30">
                         <div class="space-y-2">
                             <label class="text-xs font-black text-slate-500 uppercase tracking-widest pl-1">{{ __('Role') }} <span class="text-rose-500">*</span></label>
                             <div id="role-select-wrapper" class="relative">{{-- Dynamic --}}</div>
diff --git a/resources/views/admin/permission/accounts.blade.php b/resources/views/admin/permission/accounts.blade.php
index fab6567..56afae9 100644
--- a/resources/views/admin/permission/accounts.blade.php
+++ b/resources/views/admin/permission/accounts.blade.php
@@ -96,7 +96,7 @@ $roleSelectConfig = [
                         </div>
                     </div>
                     @if(auth()->user()->isSystemAdmin())
-                    <div class="space-y-2 relative z-30">
+                    <div class="space-y-2 relative z-10 focus-within:z-30">
                         <label class="text-xs font-black text-slate-500 uppercase tracking-widest pl-1">{{ __('Affiliation') }}</label>
                         <x-searchable-select id="modal-account-company" name="company_id" placeholder="{{ __('SYSTEM') }}" x-model="currentUser.company_id" @change="currentUser.company_id = $event.target.value; updateRoleSelect()">
                             @foreach($companies as $company)
@@ -105,7 +105,7 @@ $roleSelectConfig = [
                         </x-searchable-select>
                     </div>
                     @endif
-                    <div class="grid grid-cols-1 md:grid-cols-2 gap-6 relative z-20">
+                    <div class="grid grid-cols-1 md:grid-cols-2 gap-6 relative z-10 focus-within:z-30">
                         <div class="space-y-2">
                             <label class="text-xs font-black text-slate-500 uppercase tracking-widest pl-1">{{ __('Role') }} <span class="text-rose-500">*</span></label>
                             <div id="role-select-wrapper" class="relative">{{-- Dynamic --}}</div>