diff --git a/addons/hr_org_chart/static/src/js/hr_org_chart.js b/addons/hr_org_chart/static/src/js/hr_org_chart.js
index 688456eae74..085df1faa4a 100644
--- a/addons/hr_org_chart/static/src/js/hr_org_chart.js
+++ b/addons/hr_org_chart/static/src/js/hr_org_chart.js
@@ -106,7 +106,7 @@ var FieldOrgChart = AbstractField.extend({
                             '.o_employee_redirect', _.bind(self._onEmployeeRedirect, self));
                         return $title;
                     },
-                    container: 'body',
+                    container: this,
                     placement: 'left',
                     trigger: 'focus',
                     content: function () {
diff --git a/addons/hr_org_chart/static/src/scss/hr_org_chart.scss b/addons/hr_org_chart/static/src/scss/hr_org_chart.scss
index 7449f2adc6a..8c4d9d8960d 100644
--- a/addons/hr_org_chart/static/src/scss/hr_org_chart.scss
+++ b/addons/hr_org_chart/static/src/scss/hr_org_chart.scss
@@ -256,6 +256,7 @@
 // POP OVER
 .o_org_chart_popup.popover {
     max-width: 400px;
+    margin-right: 5px;
 
     .popover-header {
         height: 47px;
@@ -280,3 +281,14 @@
         margin-bottom: 0;
     }
 }
+
+// Right to Left specific style to flip the popover arrow
+.o_rtl {
+    .o_org_chart_popup.popover .arrow {
+        left: 100%;
+        -webkit-transform: matrix(-1, 0, 0, 1, 0, 0);
+        -moz-transform: matrix(-1, 0, 0, 1, 0, 0);
+        -o-transform: matrix(-1, 0, 0, 1, 0, 0);
+        transform: matrix(-1, 0, 0, 1, 0, 0);
+    }
+}