diff --git a/shared/css/static/modal-server.scss b/shared/css/static/modal-server.scss
index 942160f2..a5be004d 100644
--- a/shared/css/static/modal-server.scss
+++ b/shared/css/static/modal-server.scss
@@ -77,6 +77,10 @@ $required_notab_height: 950px;
 	display: none;
 }
 
+.tab-tag-server-settings-general {
+	display: none!important;
+}
+
 .container-server-settings-general {
 	display: flex;
 	flex-shrink: 0;
@@ -87,6 +91,10 @@ $required_notab_height: 950px;
 		display: flex;
 	}
 
+	.tab-tag-server-settings-general {
+		display: inline-block!important;
+	}
+
 	.container-server-settings-general {
 		display: none;
 	}
diff --git a/shared/html/templates.html b/shared/html/templates.html
index 1ceeb475..a43c0335 100644
--- a/shared/html/templates.html
+++ b/shared/html/templates.html
@@ -797,7 +797,7 @@
                     </div>
                     <x-tab>
                         <x-entry>
-                            <x-tag>{{tr "General" /}}</x-tag>
+                            <x-tag x-entry-class="tab-tag-server-settings-general">{{tr "General" /}}</x-tag>
                             <x-content>
                                 <div class="tab-server-settings-general properties-general">
                                     <div class="container-name-icon form-row">
diff --git a/shared/js/main.ts b/shared/js/main.ts
index 1c06b50f..a36ac5b4 100644
--- a/shared/js/main.ts
+++ b/shared/js/main.ts
@@ -257,6 +257,7 @@ function main() {
             const active_connection = server_connections.active_connection_handler();
             if(active_connection)
                 active_connection.resize_elements();
+            $(".window-resize-listener").trigger('resize');
         }, 1000);
     });
 
diff --git a/shared/js/ui/elements/tab.ts b/shared/js/ui/elements/tab.ts
index 5f7cb482..b1c0c939 100644
--- a/shared/js/ui/elements/tab.ts
+++ b/shared/js/ui/elements/tab.ts
@@ -60,18 +60,42 @@ var TabFunctions = {
             });
 
             height_watcher.css('min-height', max_height + "px");
+            tag.find(".window-resize-listener").trigger('resize');
         };
 
         template.find("x-entry").each( (_, _entry) => {
             const entry = $(_entry);
 
-            let tag_header = $.spawn("div").addClass("entry");
-            if(copy)
-                tag_header.append(entry.find("x-tag").clone(true, true));
-            else
-                tag_header.append(entry.find("x-tag"));
-
+            const tag_header = $.spawn("div").addClass("entry");
             const tag_content = copy ? entry.find("x-content").clone(true, true) : entry.find("x-content");
+
+            {
+                const header_tag = entry.find("x-tag");
+                const header_data = copy ? header_tag.contents().clone(true, true) : header_tag.contents();
+
+                if(header_tag.attr("x-entry-class"))
+                    tag_header.addClass(header_tag.attr("x-entry-class"));
+                tag_header.append(header_data);
+
+                /* listener if the tab might got removed */
+                tag_header.addClass("window-resize-listener");
+                tag_header.on('resize', event => {
+                    if(!tag_header.is(':visible') && tag_header.hasClass('selected')) {
+                        let element = tag_header.next('.entry:visible');
+                        if(element.length == 0)
+                            element = tag_header.prev('.entry:visible');
+                        if(element.length == 0) {
+                            tag_header.removeClass("selected");
+                            tag_content.hide();
+                        } else {
+                            element.first().trigger('click');
+                        }
+                        console.log("Next: %o", tag_header.next('.entry:visible'));
+                        console.log("prev: %o", tag_header.prev('.entry:visible'));
+                    }
+                });
+            }
+
             content.append(tag_content.hide());
 
             tag_header.on("click", () => {