diff --git a/js/layouts/tab-container/regular-tabs.js b/js/layouts/tab-container/regular-tabs.js
index 24b92cd12..bafbf85e8 100644
--- a/js/layouts/tab-container/regular-tabs.js
+++ b/js/layouts/tab-container/regular-tabs.js
@@ -127,13 +127,13 @@ $.widget( "itop.regulartabs", $.ui.tabs, {
 	// JQuery UI overload
 	disable: function(index){
 		const panel = this._getPanelForTab( index );
-		panel.hide();
+		panel.addClass('ibo-is-hidden'); // Do not use .hide() since it alters the tab state
 		this._super( index );        
 	},
 	// JQuery UI overload
 	enable: function(index) {
 		const panel = this._getPanelForTab( index );
-		panel.show();
+		panel.removeClass('ibo-is-hidden'); // Do not use .show() since it alters the tab state
 		this._super( index );  
 	},
 });
diff --git a/js/layouts/tab-container/scrollable-tabs.js b/js/layouts/tab-container/scrollable-tabs.js
index 9ffaec8a0..9a088db09 100644
--- a/js/layouts/tab-container/scrollable-tabs.js
+++ b/js/layouts/tab-container/scrollable-tabs.js
@@ -380,13 +380,13 @@ $.widget( "itop.scrollabletabs", $.ui.tabs, {
 	// JQuery UI overload
 	disable: function(index){
 		const panel = this._getPanelForTab( this.tabs[index] );
-		panel.hide();
+		panel.addClass('ibo-is-hidden'); // Do not use .hide() since it alters the tab state
 		this._super( index );        
 	},
 	// JQuery UI overload
 	enable: function(index) {
 		const panel = this._getPanelForTab( this.tabs[index] );
-		panel.show();
+		panel.removeClass('ibo-is-hidden'); // Do not use .show() since it alters the tab state
 		this._super( index );  
 	},
 });