diff --git a/module/index/js/ajaxiframemodal.ui.js b/module/index/js/ajaxiframemodal.ui.js
index 9becf0c66c..9daae8413e 100644
--- a/module/index/js/ajaxiframemodal.ui.js
+++ b/module/index/js/ajaxiframemodal.ui.js
@@ -16,12 +16,12 @@ $(document).off('locate.zt').on('locate.zt', function(e, data)
 
 $(document).on('shown', '.modal', function()
 {
-    if($(this).find('.modal-actions>[data-dismiss="modal"]').length) parent.$('iframe[name="' + window.name + '"]').closest('.modal-dialog').find('.modal-header>.close').hide();
+    if($(this).find('.modal-actions>[data-dismiss="modal"]').length) parent.$('iframe[name="' + window.frameElement.name + '"]').closest('.modal-dialog').find('.modal-header>.close').hide();
 }).on('hidden', '.modal', function()
 {
     setTimeout(function()
     {
-        if(!$(this).find('.modal-actions>[data-dismiss="modal"]').length) parent.$('iframe[name="' + window.name + '"]').closest('.modal-dialog').find('.modal-header>.close').show();
+        if(!$(this).find('.modal-actions>[data-dismiss="modal"]').length) parent.$('iframe[name="' + window.frameElement.name + '"]').closest('.modal-dialog').find('.modal-header>.close').show();
     }, 500);
 });
 $('body').on('click', '.modal [data-dismiss="modal"]', function(e){e.stopPropagation();});
@@ -50,7 +50,7 @@ $(function()
             resizeModal();
             $body.zuiInit().removeClass('invisible');
 
-            if(parent.$('iframe[name="' + window.name + '"]').closest('.modal-dialog').find('.modal-header>.close').length) $('body>.modal-dialog>.modal-content>.modal-actions>[data-dismiss="modal"]').hide();
+            if(parent.$('iframe[name="' + window.frameElement.name + '"]').closest('.modal-dialog').find('.modal-header>.close').length) $('body>.modal-dialog>.modal-content>.modal-actions>[data-dismiss="modal"]').hide();
         }
     });
 
diff --git a/www/js/zui3/zin.js b/www/js/zui3/zin.js
index d6dd1b9339..5d4d6a2e0a 100644
--- a/www/js/zui3/zin.js
+++ b/www/js/zui3/zin.js
@@ -30,7 +30,7 @@
     const isIndexPage = config.currentModule === 'index' && config.currentMethod === 'index';
 
     const DEBUG       = config.debug;
-    const currentCode = window.name.split('-')[1];
+    const currentCode = (window.frameElement ? window.frameElement.name : window.name).split('-')[1];
     const isInAppTab  = parent.window !== window;
     const fetchTasks  = new Map();
     const startTime   = performance.now();