diff --git a/app/themes/overrides/OptionsOverrides.scss b/app/themes/overrides/OptionsOverrides.scss
index 39b34ca9e0..93aed8b389 100644
--- a/app/themes/overrides/OptionsOverrides.scss
+++ b/app/themes/overrides/OptionsOverrides.scss
@@ -1 +1,11 @@
 // Css module overrides go here …
+
+.ul {
+  overflow-x: hidden;
+  overflow-y: overlay;
+  max-height: 300px;
+  &::-webkit-scrollbar-button {
+    height: 7px;
+    display: block;
+  }
+}
diff --git a/features/step_definitions/select-language-steps.js b/features/step_definitions/select-language-steps.js
index 9705f606ad..cd29a2ef7f 100644
--- a/features/step_definitions/select-language-steps.js
+++ b/features/step_definitions/select-language-steps.js
@@ -20,7 +20,7 @@ When(/^I open language selection dropdown$/, async function () {
 });
 
 When(/^I select Japanese language$/, async function () {
-  return this.click('//*[@class="SimpleOptions_label"][contains(text(), "日本語")]', By.xpath);
+  return this.click('//span[contains(text(), "日本語")]', By.xpath);
 });
 
 When(/^I submit the language selection form$/, async function () {