diff --git a/app/scripts/eslint/i18n-usage.ts b/app/scripts/eslint/i18n-usage.ts
index d9ad00480..aaa55627c 100644
--- a/app/scripts/eslint/i18n-usage.ts
+++ b/app/scripts/eslint/i18n-usage.ts
@@ -51,7 +51,7 @@ function getMemberKey(node: TSESTree.MemberExpression) {
 
     // strings['title']
     if (node.computed && node.property?.type === "Literal" && typeof node.property.value === "string") {
-        node.property.value;
+        return node.property.value;
     }
 
     return undefined;
diff --git a/app/src/views/AccountDetails/index.tsx b/app/src/views/AccountDetails/index.tsx
index 6dd8301ac..3aaddf43b 100644
--- a/app/src/views/AccountDetails/index.tsx
+++ b/app/src/views/AccountDetails/index.tsx
@@ -218,6 +218,8 @@ export function Component() {
                     withPadding
                     withDarkBackground
                     spacing="lg"
+                    empty={isNotDefined(montandonTokenResponse)
+                        || montandonTokenResponse.results.length === 0}
                 >
                     <ListView
                         layout="grid"
diff --git a/packages/ui/src/components/Modal/index.tsx b/packages/ui/src/components/Modal/index.tsx
index 5dae90452..a7148fb4b 100644
--- a/packages/ui/src/components/Modal/index.tsx
+++ b/packages/ui/src/components/Modal/index.tsx
@@ -95,6 +95,7 @@ function Modal(props: Props) {
                         {...containerProps}
                         withPadding
                         withoutWrapInHeader
+                        withoutWrapInFooter
                         className={_cs(styles.modal, className)}
                         withContentOverflow
                         headerActions={(!withoutCloseButton || headerActions) ? (
diff --git a/packages/ui/src/components/SelectInputContainer/styles.module.css b/packages/ui/src/components/SelectInputContainer/styles.module.css
index 56fd3dc2b..6308eca8e 100644
--- a/packages/ui/src/components/SelectInputContainer/styles.module.css
+++ b/packages/ui/src/components/SelectInputContainer/styles.module.css
@@ -1,9 +1,12 @@
 .popup {
+    display: flex;
+    flex-direction: column;
     padding: var(--go-ui-spacing-sm) 0;
 
     .list {
         display: flex;
         flex-direction: column;
+        flex-grow: 1;
         overflow: auto;
 
         .list-item {