diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
index 63910e245..36078b715 100644
--- a/app/templates/Standard/add-edit-view.php
+++ b/app/templates/Standard/add-edit-view.php
@@ -73,10 +73,10 @@
 
 <div class="page-title-container">
   <div class="page-title">
-    <?php if(empty($subnav)): ?>
-      <h1><?= $vv_title; ?></h1>
+    <?php if(empty($subnav) || $this->getLayout() !== 'iframe'): ?>
+      <h1><?= $vv_title ?></h1>
     <?php else: ?>
-      <h2><?= $vv_title; ?></h2>
+      <h2><?= $vv_title ?></h2>
     <?php endif; ?>
   </div>
   <?php
@@ -157,9 +157,10 @@
   ?>
 </div>
 
-<?php if(empty($subnav)): ?>
+<!-- If we have an iframe we alway render the flash messages -->
+<?php if(empty($subnav) || $this->getLayout() === 'iframe'): ?>
   <?php /* Flash Messages are placed below the main title when there's no subnavigation. */ ?>
-  <?= $this->element('flash', $flashArgs); ?>
+  <?= $this->element('flash', $flashArgs) ?>
 <?php endif; ?>
 
 <?php