diff --git a/ui/src/core_components/embeds/CoreGoogleMaps.vue b/ui/src/core_components/embed/CoreGoogleMaps.vue
similarity index 99%
rename from ui/src/core_components/embeds/CoreGoogleMaps.vue
rename to ui/src/core_components/embed/CoreGoogleMaps.vue
index 3f1d39a9c..0b50b944a 100644
--- a/ui/src/core_components/embeds/CoreGoogleMaps.vue
+++ b/ui/src/core_components/embed/CoreGoogleMaps.vue
@@ -204,7 +204,7 @@ watch(fields.mapId, initMap);
 }
 
 .CoreGoogleMaps.beingEdited .mask {
-  pointer-events: all;
+  pointer-events: auto;
   position: absolute;
   top: 0;
   left: 0;
diff --git a/ui/src/core_components/embeds/CoreIFrame.vue b/ui/src/core_components/embed/CoreIFrame.vue
similarity index 94%
rename from ui/src/core_components/embeds/CoreIFrame.vue
rename to ui/src/core_components/embed/CoreIFrame.vue
index 2e9935125..54d98ea2c 100644
--- a/ui/src/core_components/embeds/CoreIFrame.vue
+++ b/ui/src/core_components/embed/CoreIFrame.vue
@@ -68,6 +68,10 @@ function handleLoad() {
   height: 80vh;
 }
 
+.CoreIFrame.beingEdited:not(.selected) iframe {
+    pointer-events: none;
+}
+
 .CoreIFrame  iframe {
   width: 100%;
   height: 100%;
@@ -81,7 +85,7 @@ function handleLoad() {
 }
 
 .CoreIFrame.beingEdited .mask {
-  pointer-events: all;
+  pointer-events: auto;
   position: absolute;
   top: 0;
   left: 0;
diff --git a/ui/src/core_components/embeds/CorePDF.vue b/ui/src/core_components/embed/CorePDF.vue
similarity index 83%
rename from ui/src/core_components/embeds/CorePDF.vue
rename to ui/src/core_components/embed/CorePDF.vue
index e62cb4ebd..f5b32a30a 100644
--- a/ui/src/core_components/embeds/CorePDF.vue
+++ b/ui/src/core_components/embed/CorePDF.vue
@@ -1,8 +1,8 @@
 <template>
 	<div class="CorePDF">
-		<object class="pdf" :data="fields.source.value" type="application/pdf">
+		<object class="pdf" :data="fields.source.value" :key="fields.source.value" type="application/pdf">
 			<p>
-				You don't have a PDF plugin, but you can
+				You're not authorised to embed in the browser or you don't have PDF plugin
 				<a :href="fields.source.value">download the PDF file. </a>
 			</p>
 		</object>
@@ -48,6 +48,10 @@ const fields = inject(injectionKeys.evaluatedFields);
   height: 80vh;
 }
 
+.CorePDF.beingEdited:not(.selected) object {
+	pointer-events: none;
+}
+
 .CorePDF .pdf {
   width: 100%;
   height: 100%;
@@ -61,7 +65,7 @@ const fields = inject(injectionKeys.evaluatedFields);
 }
 
 .CorePDF.beingEdited .mask {
-  pointer-events: all;
+  pointer-events: auto;
   position: absolute;
   top: 0;
   left: 0;