diff --git a/modules/ui/src/app/pages/devices/devices.component.ts b/modules/ui/src/app/pages/devices/devices.component.ts
index df42cd870..73553e9a1 100644
--- a/modules/ui/src/app/pages/devices/devices.component.ts
+++ b/modules/ui/src/app/pages/devices/devices.component.ts
@@ -316,6 +316,8 @@ export class DevicesComponent
       addButton =
         this.element.nativeElement.querySelector('.device-add-button');
     }
-    addButton?.focus();
+    timer(100).subscribe(() => {
+      addButton?.focus();
+    });
   }
 }