diff --git a/src/public/app/widgets/floating_buttons/floating_buttons.ts b/src/public/app/widgets/floating_buttons/floating_buttons.ts
index fbfd94611..6fa8727fe 100644
--- a/src/public/app/widgets/floating_buttons/floating_buttons.ts
+++ b/src/public/app/widgets/floating_buttons/floating_buttons.ts
@@ -10,7 +10,8 @@ const TPL = `
             position: relative;
         }
 
-        .floating-buttons-children,.show-floating-buttons {
+        .floating-buttons-children,
+        .show-floating-buttons {
             position: absolute;
             top: 10px;
             right: 10px;
@@ -19,6 +20,21 @@ const TPL = `
             z-index: 100;
         }
 
+        .note-split.rtl .floating-buttons-children,
+        .note-split.rtl .show-floating-buttons {
+            right: unset;
+            left: 10px;
+        }
+
+        .note-split.rtl .close-floating-buttons {
+            order: -1;
+        }
+
+        .note-split.rtl .close-floating-buttons,
+        .note-split.rtl .show-floating-buttons {
+            transform: rotate(180deg);
+        }
+
         .type-canvas .floating-buttons-children {
             top: 70px;
         }
diff --git a/src/public/app/widgets/note_wrapper.ts b/src/public/app/widgets/note_wrapper.ts
index dd108f9c3..fa08e3a75 100644
--- a/src/public/app/widgets/note_wrapper.ts
+++ b/src/public/app/widgets/note_wrapper.ts
@@ -5,6 +5,7 @@ import type BasicWidget from "./basic_widget.js";
 import type { EventData } from "../components/app_context.js";
 import type NoteContext from "../components/note_context.js";
 import type FNote from "../entities/fnote.js";
+import { getLocaleById } from "../services/i18n.js";
 
 export default class NoteWrapperWidget extends FlexContainer<BasicWidget> {
 
@@ -56,6 +57,10 @@ export default class NoteWrapperWidget extends FlexContainer<BasicWidget> {
         this.$widget.addClass(utils.getMimeTypeClass(note.mime));
 
         this.$widget.toggleClass("protected", note.isProtected);
+
+        const noteLanguage = note?.getLabelValue("language");
+        const locale = getLocaleById(noteLanguage);
+        this.$widget.toggleClass("rtl", !!locale?.rtl);
     }
 
     #isFullWidthNote(note: FNote) {