2 files changed, 10 insertions, 1 deletions
diff --git a/catalog-ui/src/app/ng2/components/ui/plugin/plugin-frame.component.less b/catalog-ui/src/app/ng2/components/ui/plugin/plugin-frame.component.less
index d2d4c98cb4..d97c345376 100644
--- a/catalog-ui/src/app/ng2/components/ui/plugin/plugin-frame.component.less
+++ b/catalog-ui/src/app/ng2/components/ui/plugin/plugin-frame.component.less
@@ -7,6 +7,6 @@
         top: 3px;
         left: 2px;
         position: relative;
-        z-index: 1030
+        background-color: white;
     }
 }
diff --git a/catalog-ui/src/app/ng2/services/event-bus.service.ts b/catalog-ui/src/app/ng2/services/event-bus.service.ts
index 10990e2f2c..664ce35080 100644
--- a/catalog-ui/src/app/ng2/services/event-bus.service.ts
+++ b/catalog-ui/src/app/ng2/services/event-bus.service.ts
@@ -54,7 +54,12 @@ export class EventBusService extends BasePubSub {
     }
 
     public disableNavigation(isDisable: boolean) {
+        let iframes = document.getElementsByClassName("plugin-iframe");
+
         if (isDisable) {
+            _.forEach(iframes, (iframeElement: HTMLElement) => {
+                iframeElement.style.zIndex = '1300';
+            });
             let disableDiv = document.createElement('div');
             disableDiv.style.cssText = "position: fixed;\n" +
                 "z-index: 1029;\n" +
@@ -68,6 +73,10 @@ export class EventBusService extends BasePubSub {
         }
         else {
             document.getElementsByClassName("disable-navigation-div")[0].remove();
+
+            _.forEach(iframes, (iframeElement: HTMLElement) => {
+                iframeElement.style.zIndex = '';
+            });
         }
     }