diff --git a/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/admin-event-form-preview.component.spec.ts b/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/admin-event-form-preview.component.spec.ts
index e4e374d35..31c201c92 100644
--- a/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/admin-event-form-preview.component.spec.ts
+++ b/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/admin-event-form-preview.component.spec.ts
@@ -33,8 +33,8 @@ describe('AdminEventFormPreviewComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [BrowserAnimationsModule, MatDialogModule],
-      declarations: [AdminEventFormPreviewComponent, TestHostComponent],
+      imports: [BrowserAnimationsModule, MatDialogModule, AdminEventFormPreviewComponent],
+      declarations: [TestHostComponent],
       providers: [{
         provide: MatDialog, useClass: MatDialogMock
       }]
diff --git a/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/admin-event-form-preview.component.ts b/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/admin-event-form-preview.component.ts
index 5ef878982..98b2633a0 100644
--- a/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/admin-event-form-preview.component.ts
+++ b/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/admin-event-form-preview.component.ts
@@ -6,7 +6,11 @@ import { AdminEventFormPreviewDialogComponent } from './form-preview-dialog/admi
     selector: 'admin-event-form-preview',
     templateUrl: './admin-event-form-preview.component.html',
     styleUrls: ['./admin-event-form-preview.component.scss'],
-    standalone: false
+    standalone: true,
+    // empty - template has no directives
+    imports: [
+
+    ]
 })
 export class AdminEventFormPreviewComponent implements OnChanges {
   @Input() formDefinition: any[];
diff --git a/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/form-preview-dialog/admin-event-form-preview-dialog.component.spec.ts b/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/form-preview-dialog/admin-event-form-preview-dialog.component.spec.ts
index 347d52334..ca39c953c 100644
--- a/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/form-preview-dialog/admin-event-form-preview-dialog.component.spec.ts
+++ b/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/form-preview-dialog/admin-event-form-preview-dialog.component.spec.ts
@@ -3,16 +3,13 @@ import { MatDialogModule as MatDialogModule, MAT_DIALOG_DATA as MAT_DIALOG_DATA
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { AdminEventFormPreviewDialogComponent } from './admin-event-form-preview-dialog.component';
 
-import { AdminEventFormPreviewComponent } from '../admin-event-form-preview.component';
-
-describe('AdminEventFormPreviewComponent', () => {
+describe('AdminEventFormPreviewDialogComponent', () => {
   let component: AdminEventFormPreviewDialogComponent
   let fixture: ComponentFixture<AdminEventFormPreviewDialogComponent>
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [BrowserAnimationsModule, MatDialogModule],
-      declarations: [AdminEventFormPreviewComponent],
+      imports: [BrowserAnimationsModule, MatDialogModule, AdminEventFormPreviewDialogComponent],
       providers: [{
         provide: MAT_DIALOG_DATA,
         useValue: {
diff --git a/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/form-preview-dialog/admin-event-form-preview-dialog.component.ts b/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/form-preview-dialog/admin-event-form-preview-dialog.component.ts
index 42dab95e5..026809e1d 100644
--- a/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/form-preview-dialog/admin-event-form-preview-dialog.component.ts
+++ b/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/form-preview-dialog/admin-event-form-preview-dialog.component.ts
@@ -1,12 +1,19 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
-import { MAT_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+import { MAT_DIALOG_DATA as MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
+import { ObservationEditModule } from 'mage-web-app/observation/observation-edit/observation-edit.module';
 
 @Component({
     selector: 'admin-event-form-preview-dialog',
     templateUrl: './admin-event-form-preview-dialog.component.html',
     styleUrls: ['./admin-event-form-preview-dialog.component.scss'],
-    standalone: false
+    standalone: true,
+    imports: [
+      MatDialogModule,
+      MatButtonModule,
+      ObservationEditModule
+    ]
 })
 export class AdminEventFormPreviewDialogComponent implements OnInit {
 
diff --git a/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form.module.ts b/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form.module.ts
index 058027c8d..029ce2308 100644
--- a/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form.module.ts
+++ b/web-app/src/app/admin/admin-event/admin-event-form/admin-event-form.module.ts
@@ -28,8 +28,6 @@ import { AdminBreadcrumbModule } from '../../admin-breadcrumb/admin-breadcrumb.m
 
 @NgModule({
     declarations: [
-        AdminEventFormPreviewComponent,
-        AdminEventFormPreviewDialogComponent,
         FormDetailsComponent,
         FieldDialogComponent,
         SymbologyDialogComponent,
@@ -55,7 +53,9 @@ import { AdminBreadcrumbModule } from '../../admin-breadcrumb/admin-breadcrumb.m
         MatSelectModule,
         MatDividerModule,
         ObservationEditModule,
-        AdminBreadcrumbModule
+        AdminBreadcrumbModule,
+        AdminEventFormPreviewComponent,
+        AdminEventFormPreviewDialogComponent
     ],
     exports: [
         AdminEventFormPreviewComponent,