diff --git a/addons/point_of_sale/static/src/js/custom_hooks.js b/addons/point_of_sale/static/src/js/custom_hooks.js
index 23c91f118e4..b31b8f4688e 100644
--- a/addons/point_of_sale/static/src/js/custom_hooks.js
+++ b/addons/point_of_sale/static/src/js/custom_hooks.js
@@ -3,7 +3,7 @@ import { OfflineErrorPopup } from "./Popups/OfflineErrorPopup";
 import { ConfirmPopup } from "./Popups/ConfirmPopup";
 import { ErrorTracebackPopup } from "./Popups/ErrorTracebackPopup";
 import { ErrorPopup } from "./Popups/ErrorPopup";
-import { useEnv, onMounted, onPatched, useComponent } from "@odoo/owl";
+import { useEnv, onMounted, onPatched, useComponent, useRef } from "@odoo/owl";
 
 /**
  * Introduce error handlers in the component.
@@ -75,12 +75,15 @@ export function useErrorHandlers() {
     };
 }
 
+/**
+ * Assumes t-ref="root" in the root element of the component that uses this hook.
+ */
 export function useAutoFocusToLast() {
-    const current = useComponent();
+    const root = useRef("root");
     let target = null;
     function autofocus() {
         const prevTarget = target;
-        const allInputs = current.el.querySelectorAll("input");
+        const allInputs = root.el.querySelectorAll("input");
         target = allInputs[allInputs.length - 1];
         if (target && target !== prevTarget) {
             target.focus();
diff --git a/addons/point_of_sale/static/src/xml/Popups/EditListPopup.xml b/addons/point_of_sale/static/src/xml/Popups/EditListPopup.xml
index f7fd964e579..17c6a9b9bc5 100644
--- a/addons/point_of_sale/static/src/xml/Popups/EditListPopup.xml
+++ b/addons/point_of_sale/static/src/xml/Popups/EditListPopup.xml
@@ -2,7 +2,7 @@
 <templates id="template" xml:space="preserve">
 
     <t t-name="EditListPopup" owl="1">
-        <div class="popup popup-text edit-list-popup">
+        <div class="popup popup-text edit-list-popup" t-ref="root">
             <header class="title">
                 <t t-esc="props.title" />
                 <span class="sub-title" t-esc="props.name"/>