diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html
index e77bb70..21f7dc4 100644
--- a/src/app/dashboard/dashboard.component.html
+++ b/src/app/dashboard/dashboard.component.html
@@ -8,7 +8,7 @@
     </div>
     <div class="tfw-web tao-grid-top-left"
          [ngClass]="{'deploy-blur': deploying || polling}">
-        <div class="iframe-container">
+        <div *ngIf="iframeUrl | async" class="iframe-container">
           <div *ngIf="showUrlBar | async" class="urlbar-container">
             <button class="refresh btn btn-sm rounded-circle" (click)="reloadIframe()">&#8635;</button>
             <input type="text"
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
index 41272e0..66b0aca 100644
--- a/src/app/dashboard/dashboard.component.ts
+++ b/src/app/dashboard/dashboard.component.ts
@@ -115,15 +115,15 @@ export class DashboardComponent implements OnInit, OnDestroy {
     this.terminalMenuItem.next(item);
   }
 
-  scrollMessagesToBottom(): void {
+  scrollMessagesToBottom() {
     const element = this.messages.nativeElement;
     // This must be done in the Angular event loop to avoid messing up
     // change detection (not in the template like ConsoleComponent does)
     element.scrollTop = element.scrollHeight;
   }
 
-  iframeLoad(): void {
-    if (this.webiframe) {
+  iframeLoad() {
+    if (this.webiframe && this.iframeUrl.value) {
       const href = this.webiframe.nativeElement.contentWindow.frames.location.href;
       const niceURL = href.match(/.*?\/\/.*?(\/.*)/)[1];
       this.actualIframeUrl = niceURL;