diff --git a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_model.js b/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_model.js
index 6180b337daa..e0a35dcd353 100644
--- a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_model.js
+++ b/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_model.js
@@ -651,7 +651,12 @@ export class HierarchyModel extends Model {
         if ("domain" in params) {
             config.domain = params.domain;
             if (!params.domain.length) {
-                config.domain = this.defaultDomain;
+                if (config.context.hierarchy_res_id) {
+                    config.domain = [["id", "=", config.context.hierarchy_res_id]];
+                    delete config.context.hierarchy_res_id; // just needed for the first load.
+                } else {
+                    config.domain = this.defaultDomain;
+                }
             }
         }
         return config;
diff --git a/addons/hr_org_chart/views/hr_views.xml b/addons/hr_org_chart/views/hr_views.xml
index 052d1caeef9..7c73e36be88 100644
--- a/addons/hr_org_chart/views/hr_views.xml
+++ b/addons/hr_org_chart/views/hr_views.xml
@@ -24,6 +24,9 @@
         <field name="model">hr.employee</field>
         <field name="inherit_id" ref="hr.view_employee_form"/>
         <field name="arch" type="xml">
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button name="%(hr_org_chart.action_hr_employee_org_chart)d" string="Org Chart" type="action" context="{'hierarchy_res_id': id}" invisible="not parent_id and not child_ids"/>
+            </xpath>
             <div id="o_work_employee_main" position="after">
                 <div id="o_employee_right" class="col-lg-4 px-0 ps-lg-5 pe-lg-0">
                     <separator string="Organization Chart"/>