diff --git a/src/js/popup.js b/src/js/popup.js
index 0226ddd..c3503b6 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1002,11 +1002,10 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
     document.querySelector("#edit-container-panel-name-input").value = identity.name || "";
     document.querySelector("#edit-container-panel-usercontext-input").value = userContextId || NEW_CONTAINER_ID;
     const containerName = document.querySelector("#edit-container-panel-name-input");
-    setTimeout(function()
-    { 
-      containerName.focus(); 
-      containerName.select();  
-    }, 0);
+    window.requestAnimationFrame(() => {
+      containerName.select();
+      containerName.focus();
+    });
     [...document.querySelectorAll("[name='container-color']")].forEach(colorInput => {
       colorInput.checked = colorInput.value === identity.color;
     });