diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
index bd24b598400..2e04ab2ab3e 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
@@ -63,9 +63,14 @@ createWidget('topic-admin-menu-button', {
 
     const $button = $(e.target).closest('button');
     const position = $button.position();
+    const rtl = $('html').hasClass('rtl');
     position.left = position.left;
     position.outerHeight = $button.outerHeight();
 
+    if (rtl) {
+        position.left -= 217 - $button.outerWidth();
+    }
+
     if (this.attrs.fixed) {
       position.left += $button.width() - 203;
     }
diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss
index ad7e5c4af7a..298f458f3ec 100644
--- a/app/assets/stylesheets/common/base/rtl.scss
+++ b/app/assets/stylesheets/common/base/rtl.scss
@@ -2,9 +2,9 @@
 // *** These styles are all going to be flipped by the r2 gem ***
 // Adding the !important declaration to a rule prevents it from being flipped.
 
-// Keep the topic admin menu on the page
-.rtl .popup-menu {
-  right: 0 !important;
+.rtl #topic-progress-wrapper .topic-admin-popup-menu.right-side,
+.rtl #topic-progress-wrapper.docked .topic-admin-popup-menu.right-side {
+  right: 80px;
 }
 
 // This is used to flip the .d-icon-caret-right