diff --git a/src/public/app/widgets/note_language.ts b/src/public/app/widgets/note_language.ts
index 79134fd5e..1a1070e44 100644
--- a/src/public/app/widgets/note_language.ts
+++ b/src/public/app/widgets/note_language.ts
@@ -19,6 +19,10 @@ const TPL = `\
         .note-language-dropdown [dir=rtl] {
             text-align: right;
         }
+
+        .dropdown-item.rtl > .check {
+            order: 1;
+        }
     </style>
 </div>
 `;
@@ -77,9 +81,6 @@ export default class NoteLanguageWidget extends NoteContextAwareWidget {
         for (const locale of this.locales) {
             if (typeof locale === "object") {
                 const $title = $("<span>").text(locale.name);
-                if (locale.rtl) {
-                    $title.attr("dir", "rtl");
-                }
 
                 const $link = $('<a class="dropdown-item">')
                     .attr("data-language", locale.id)
@@ -90,6 +91,10 @@ export default class NoteLanguageWidget extends NoteContextAwareWidget {
                     this.save(languageId);
                 });
 
+                if (locale.rtl) {
+                    $link.attr("dir", "rtl");
+                }
+
                 if (locale.id === this.currentLanguageId) {
                     $link.addClass("selected");
                 }
diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css
index 8caae2685..07d44c18d 100644
--- a/src/public/stylesheets/theme-next/shell.css
+++ b/src/public/stylesheets/theme-next/shell.css
@@ -1006,7 +1006,8 @@ body.desktop .dropdown-submenu .dropdown-menu {
 
 .dropdown-item,
 body.mobile .dropdown-submenu .dropdown-toggle {
-    padding: 2px 16px 2px 8px !important;
+    padding: 2px 2px 2px 8px !important;
+    padding-inline-end: 16px;
     /* Note: the right padding should also accommodate the submenu arrow. */
     border-radius: 6px;
     cursor: default !important;