diff --git a/css/80_app.css b/css/80_app.css
index ab1b8e156..307eafdfb 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -1254,10 +1254,10 @@ a.hide-toggle {
     right: 0;
     height: 100%;
     background: transparent;
-    text-align: right;
 }
 [dir='rtl'] .form-label-button-wrap {
-    text-align: left;
+    right: auto;
+    left: 0;
 }
 
 .form-label-button-wrap .tag-reference-button {
diff --git a/modules/ui/raw_member_editor.js b/modules/ui/raw_member_editor.js
index c510ec94d..a37153464 100644
--- a/modules/ui/raw_member_editor.js
+++ b/modules/ui/raw_member_editor.js
@@ -146,10 +146,6 @@ export function uiRawMemberEditor(context) {
                         var label = d3_select(this).append('label')
                             .attr('class', 'form-label');
 
-                        // add the button wrap beneath the label text
-                        var buttonWrap = label.append('div')
-                            .attr('class', 'form-label-button-wrap');
-
                         var labelLink = label.append('a')
                             .attr('href', '#')
                             .on('click', selectMember);
@@ -165,6 +161,9 @@ export function uiRawMemberEditor(context) {
                             .attr('class', 'member-entity-name')
                             .text(function(d) { return utilDisplayName(d.member); });
 
+                        var buttonWrap = label.append('div')
+                            .attr('class', 'form-label-button-wrap');
+
                         buttonWrap.append('button')
                             .attr('class', 'download-icon')
                             .attr('title', t('icons.zoom_to'))