diff --git a/src/components/loading/loading.ts b/src/components/loading/loading.ts
index 293ff885b..21cb4e92f 100644
--- a/src/components/loading/loading.ts
+++ b/src/components/loading/loading.ts
@@ -67,6 +67,12 @@ export class CoreLoadingComponent implements OnInit, OnChanges {
             // Default loading message.
             this.message = this.translate.instant('core.loading');
         }
+
+        // Add class if loaded on init.
+        if (this.hideUntil) {
+            this.element.classList.add('core-loading-loaded');
+            this.content.nativeElement.classList.add('core-loading-content');
+        }
     }
 
     ngOnChanges(changes: { [name: string]: SimpleChange }): void {
diff --git a/src/core/viewer/pages/iframe/iframe.scss b/src/core/viewer/pages/iframe/iframe.scss
index 9c2fa5108..f28277b37 100644
--- a/src/core/viewer/pages/iframe/iframe.scss
+++ b/src/core/viewer/pages/iframe/iframe.scss
@@ -1,4 +1,7 @@
 ion-app.app-root page-core-viewer-iframe {
+    .scroll-content {
+        overflow: hidden;
+    }
     core-loading .core-loading-content {
         height: 100%;
     }