diff --git a/modules/ui/src/app/pages/devices/device-repository.component.html b/modules/ui/src/app/pages/devices/device-repository.component.html
index efd61fc2e..6dc585f5e 100644
--- a/modules/ui/src/app/pages/devices/device-repository.component.html
+++ b/modules/ui/src/app/pages/devices/device-repository.component.html
@@ -30,21 +30,21 @@ <h2 class="title">Devices</h2>
       </ng-container>
     </div>
   </ng-container>
-</ng-container>
-<ng-template #empty>
-  <div class="device-repository-content-empty">
-    <ng-container *ngTemplateOutlet="addDeviceButton"></ng-container>
-  </div>
-</ng-template>
+  <ng-template #empty>
+    <div class="device-repository-content-empty">
+      <ng-container *ngTemplateOutlet="addDeviceButton"></ng-container>
+    </div>
+  </ng-template>
 
-<ng-template #addDeviceButton>
-  <button
-    (click)="openDialog()"
-    aria-label="Add device"
-    class="device-add-button"
-    color="primary"
-    mat-flat-button>
-    <mat-icon>add</mat-icon>
-    Add device
-  </button>
-</ng-template>
+  <ng-template #addDeviceButton>
+    <button
+      (click)="openDialog(vm.devices)"
+      aria-label="Add device"
+      class="device-add-button"
+      color="primary"
+      mat-flat-button>
+      <mat-icon>add</mat-icon>
+      Add device
+    </button>
+  </ng-template>
+</ng-container>
diff --git a/modules/ui/src/app/pages/devices/device-repository.component.spec.ts b/modules/ui/src/app/pages/devices/device-repository.component.spec.ts
index dc6279081..98c923d91 100644
--- a/modules/ui/src/app/pages/devices/device-repository.component.spec.ts
+++ b/modules/ui/src/app/pages/devices/device-repository.component.spec.ts
@@ -136,7 +136,7 @@ describe('DeviceRepositoryComponent', () => {
           device: null,
           title: 'Create device',
           testModules: MOCK_TEST_MODULES,
-          devices: [],
+          devices: [device, device, device],
         },
         autoFocus: true,
         hasBackdrop: true,