diff --git a/module/index/css/index.css b/module/index/css/index.css
index a82f6b512f..c01012df2e 100644
--- a/module/index/css/index.css
+++ b/module/index/css/index.css
@@ -49,7 +49,8 @@ body.menu-hide {padding-left: 0;}
 .menu-hide #apps {left: 40px;}
 .app-container.loading:before {background-color: rgba(0,0,0,.1);}
 .app-container.loading:before, .app-container.loading::after {transition-delay: 3s;}
-.app-container.loading.open-from-hidden {transition: 0s;}
+.app-container.loading.open-from-hidden {transition-delay: 0s;}
+.app-container.loading.open-from-hidden > iframe {opacity: 0;}
 
 #appsBar {position: fixed; left: 96px; bottom: 0; right: 0; height: 40px; z-index: 1012; background: #fff; border-top: 1px solid #eff1f7;}
 .menu-hide #appsBar {left: 40px;}
diff --git a/module/index/js/index.js b/module/index/js/index.js
index aba2977080..0a8af0d13d 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -268,10 +268,10 @@
         var isSameUrl = iframe && url && iframe.contentWindow.location.href.endsWith(url);
         if (url && (!isSameUrl || forceReload !== false))
         {
-            app.$app.toggleClass('open-from-hidden', app.$app.is(':hidden'))
+            app.$app.toggleClass('open-from-hidden', app.zIndex < openedAppZIndex)
             reloadApp(appCode, url, true);
         }
-        app.zIndex = openedAppZIndex++;
+        app.zIndex = ++openedAppZIndex;
         app.$app.show().css('z-index', app.zIndex);
 
         /* Update task bar */
@@ -464,7 +464,7 @@
 
         if(!notTriggerEvent) app.$app.trigger('reloadapp', app);
 
-        if(!isSameUrl) app.$app.addClass('loading');
+        if(!isSameUrl || app.zIndex < openedAppZIndex) app.$app.addClass('loading');
         if(app._loadTimer) clearTimeout(app._loadTimer);
         app._loadTimer = setTimeout(function()
         {