diff --git a/module/index/js/index.ui.js b/module/index/js/index.ui.js
index 56b07ae6de..bd0284eba7 100644
--- a/module/index/js/index.ui.js
+++ b/module/index/js/index.ui.js
@@ -137,7 +137,7 @@ function openApp(url, code, options)
     }
 
     /* Show and load app */
-    const isSameUrl = openedApp.currentUrl === url;
+    const isSameUrl = $.parseLink(openedApp.currentUrl).url === $.parseLink(url).url;
     const needLoad = !isSameUrl || forceReload !== false;
     if(needLoad)
     {
@@ -174,7 +174,7 @@ function openApp(url, code, options)
         $tabs.find('li[data-app="' + code + '"]>a').addClass('active');
     }
 
-    if(debug) console.log('[APPS]', 'open:', code, {url, options, forceReload});
+    if(debug) console.log('[APPS]', 'open:', code, {url, options, needLoad, forceReload});
     triggerAppEvent(code, 'openapp', [openedApp, {load: needLoad}]);
 
     return openedApp;
@@ -756,7 +756,10 @@ $(document).on('click', '.open-in-app,.show-in-app', function(e)
     if($link.is('[data-modal],[data-toggle],.iframe,.not-in-app')) return;
     const url = $link.attr('href') || $link.data('url');
     if(url && url.includes('onlybody=yes')) return;
-    if(openApp(url, $link.data('app'), !$link.hasClass('show-in-app'))) e.preventDefault();
+    const code = $link.data('app');
+    if($.apps.openedMap[code]) showApp(code);
+    else openApp(url, $link.data('app'), !$link.hasClass('show-in-app'));
+    e.preventDefault();
 }).on('contextmenu', '.open-in-app,.show-in-app', function(event)
 {
     const $btn  = $(this);
diff --git a/www/js/zui3/zin.js b/www/js/zui3/zin.js
index ee3a00e224..52a42a6472 100644
--- a/www/js/zui3/zin.js
+++ b/www/js/zui3/zin.js
@@ -1341,7 +1341,7 @@
         if(isInAppTab) window.parent.$('body').trigger('click');
 
         const $link = $(e.target).closest('a,.open-url');
-        if(!$link.length || $link.hasClass('ajax-submit') || $link.attr('data-on') || $link.hasClass('not-open-url') || ($link.attr('target') || '')[0] === '_') return;
+        if(!$link.length || $link.hasClass('ajax-submit') || $link.attr('data-on') || $link.hasClass('show-in-app') || $link.hasClass('not-open-url') || ($link.attr('target') || '')[0] === '_') return;
 
         const href = $link.attr('href');
         if($link.is('a') && (/^(https?|javascript):/.test(href)) && !$link.data('app')) return;