diff --git a/src/containers/Tenant/GrantAccess/GrantAccess.tsx b/src/containers/Tenant/GrantAccess/GrantAccess.tsx
index 09a0e47769..a664787395 100644
--- a/src/containers/Tenant/GrantAccess/GrantAccess.tsx
+++ b/src/containers/Tenant/GrantAccess/GrantAccess.tsx
@@ -134,6 +134,8 @@ export function GrantAccess({handleCloseDrawer}: GrantAccessProps) {
         [setExplicitRightsChanges],
     );
 
+    const rightsLoading = aclIsFetching || availableRightsAreFetching;
+
     const renderSubject = () => {
         if (aclSubject) {
             return <SubjectWithAvatar subject={aclSubject} />;
@@ -144,23 +146,23 @@ export function GrantAccess({handleCloseDrawer}: GrantAccessProps) {
     const subjectSelected = Boolean(aclSubject || newSubjects.length > 0);
 
     return (
-        <LoaderWrapper loading={aclIsFetching || availableRightsAreFetching}>
-            <div className={block()}>
-                <Flex direction="column">
-                    <Flex gap={4} direction="column" className={block('navigation')}>
-                        {renderSubject()}
-                        {/* wrapper to prevent radio button stretch */}
-                        {subjectSelected && (
-                            <RightsSectionSelector
-                                value={rightView}
-                                onUpdate={setRightsView}
-                                rights={currentRightsMap}
-                                availablePermissions={availablePermissions}
-                            />
-                        )}
-                    </Flex>
+        <Flex direction="column" className={block()} height={'100%'}>
+            <Flex direction="column" grow={1}>
+                <Flex gap={4} direction="column" className={block('navigation')}>
+                    {renderSubject()}
+                    {/* wrapper to prevent radio button stretch */}
                     {subjectSelected && (
-                        <div className={block('rights-wrapper')}>
+                        <RightsSectionSelector
+                            value={rightView}
+                            onUpdate={setRightsView}
+                            rights={currentRightsMap}
+                            availablePermissions={availablePermissions}
+                        />
+                    )}
+                </Flex>
+                {subjectSelected && (
+                    <LoaderWrapper loading={rightsLoading}>
+                        <Flex grow={1} position="relative" qa="access-rights-wrapper">
                             <Rights
                                 inheritedRights={inheritedRightsSet}
                                 rights={currentRightsMap}
@@ -168,21 +170,21 @@ export function GrantAccess({handleCloseDrawer}: GrantAccessProps) {
                                 handleChangeRightGetter={handleChangeRightGetter}
                                 view={rightView}
                             />
-                        </div>
-                    )}
-                </Flex>
-
-                {subjectSelected && (
-                    <Footer
-                        onCancel={handleCloseDrawer}
-                        onDiscard={handleDiscardRightsChanges}
-                        onSave={handleSaveRightsChanges}
-                        loading={updateRightsResponse.isLoading}
-                        error={updateRightsError}
-                        disabled={!hasChanges}
-                    />
+                        </Flex>
+                    </LoaderWrapper>
                 )}
-            </div>
-        </LoaderWrapper>
+            </Flex>
+
+            {subjectSelected && (
+                <Footer
+                    onCancel={handleCloseDrawer}
+                    onDiscard={handleDiscardRightsChanges}
+                    onSave={handleSaveRightsChanges}
+                    loading={updateRightsResponse.isLoading}
+                    error={updateRightsError}
+                    disabled={!hasChanges}
+                />
+            )}
+        </Flex>
     );
 }
diff --git a/src/containers/Tenant/TenantDrawerRights.tsx b/src/containers/Tenant/TenantDrawerRights.tsx
index 590b2c824a..a8542cca76 100644
--- a/src/containers/Tenant/TenantDrawerRights.tsx
+++ b/src/containers/Tenant/TenantDrawerRights.tsx
@@ -36,7 +36,7 @@ export function TenantDrawerRights({children}: TenantDrawerWrapperProps) {
             isDrawerVisible={Boolean(showGrantAccess)}
             onCloseDrawer={handleCloseDrawer}
             renderDrawerContent={renderDrawerContent}
-            drawerId="tenant-healthcheck-details"
+            drawerId="tenant-grant-access"
             storageKey="tenant-grant-access-drawer-width"
             detectClickOutside
             hideVeil={false}
diff --git a/tests/suites/tenant/diagnostics/Diagnostics.ts b/tests/suites/tenant/diagnostics/Diagnostics.ts
index b45f8f2ad1..9d85f82efe 100644
--- a/tests/suites/tenant/diagnostics/Diagnostics.ts
+++ b/tests/suites/tenant/diagnostics/Diagnostics.ts
@@ -542,7 +542,7 @@ export class Diagnostics {
     }
 
     async isRightsWrapperVisible(): Promise<boolean> {
-        const rightsWrapper = this.page.locator('.ydb-grant-access__rights-wrapper');
+        const rightsWrapper = this.page.getByTestId('access-rights-wrapper');
         return rightsWrapper.isVisible();
     }