diff --git a/apps/i2ptunnel/jsp/editClient.jsi b/apps/i2ptunnel/jsp/editClient.jsi
index e4f7e9e1d7..f775aa381d 100644
--- a/apps/i2ptunnel/jsp/editClient.jsi
+++ b/apps/i2ptunnel/jsp/editClient.jsi
@@ -37,7 +37,7 @@
                 <input type="submit" class="default" name="action" value="Save changes" />
     <table id="clientTunnelEdit" class="tunnelConfig">
         <tr>
-            <th>
+            <th class="tunnelName excludeBackgroundImage">
                 <%=intl._t("Name")%>
             </th><th class="excludeBackgroundImage">
                 <%=intl._t("Type")%>
diff --git a/apps/i2ptunnel/jsp/editServer.jsi b/apps/i2ptunnel/jsp/editServer.jsi
index c2a00e4b29..63dc88b1ed 100644
--- a/apps/i2ptunnel/jsp/editServer.jsi
+++ b/apps/i2ptunnel/jsp/editServer.jsi
@@ -36,7 +36,7 @@
                 <input type="submit" class="default" name="action" value="Save changes" />
     <table id="serverTunnelEdit" class="tunnelConfig">
         <tr>
-            <th>
+            <th class="tunnelName excludeBackgroundImage">
                 <%=intl._t("Name")%>
             </th><th class="excludeBackgroundImage">
                 <%=intl._t("Type")%>
diff --git a/apps/i2ptunnel/jsp/js/tableSlider.js b/apps/i2ptunnel/jsp/js/tableSlider.js
index 6185882fc7..7ca6a5785c 100644
--- a/apps/i2ptunnel/jsp/js/tableSlider.js
+++ b/apps/i2ptunnel/jsp/js/tableSlider.js
@@ -23,8 +23,6 @@ hideableTables.forEach(function(configTable) {
                         ) {
                             row.style.visibility = "collapse";
                         }
-                    } else {
-                        row.firstElementChild.classList.remove('tunnelConfigExpanded');
                     }
                 } else if (row.style.visibility == "visible") {
                     if (row.firstElementChild.localName != "th") {
@@ -34,14 +32,17 @@ hideableTables.forEach(function(configTable) {
                             row.style.visibility = "collapse";
                             collapseme = true;
                         }
-                    } else {
-                        row.firstElementChild.classList.remove('tunnelConfigExpanded');
                     }
+                    row.querySelectorAll("th").forEach(function(configRow) {
+                        configRow.classList.toggle('tunnelConfigExpanded');
+                    });
+                    configTable.classList.remove('tunnelConfigExpanded');
                 } else {
                     row.style.visibility = "visible";
-                    if (row.firstElementChild.localName == 'th') {
-                        row.firstElementChild.classList.add('tunnelConfigExpanded');
-                    }
+                    row.querySelectorAll("th").forEach(function(configRow) {
+                        configRow.classList.add('tunnelConfigExpanded');
+                    });
+                    configTable.classList.add('tunnelConfigExpanded');
                 }
             }
         }
@@ -56,9 +57,9 @@ hideableTables.forEach(function(configTable) {
     }
     for (var i = 0, row; (row = hideableTables[0].offsetParent.rows[i]); i++) {
         row.style.visibility = "visible";
-        if (row.firstElementChild.localName == 'th') {
-            row.firstElementChild.classList.add('tunnelConfigExpanded');
-        }
+        row.querySelectorAll("th").forEach(function(configRow) {
+            configRow.classList.add('tunnelConfigExpanded');
+        });
     }
 });
 
diff --git a/installer/resources/themes/console/dark/i2ptunnel.css b/installer/resources/themes/console/dark/i2ptunnel.css
index dd5f1dcfda..7fae40c934 100644
--- a/installer/resources/themes/console/dark/i2ptunnel.css
+++ b/installer/resources/themes/console/dark/i2ptunnel.css
@@ -353,7 +353,7 @@ html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbod
 
 .tunnelConfigExpanded {
     background: url(images/dropdown_active.png) #433e47 !important;
-    padding-left: 0px !important;
+    padding-left: 30px;
 }
 
 .tunnelConfigContracted {
@@ -363,7 +363,11 @@ html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbod
 
 .excludeBackgroundImage {
     background-image: none !important;
-    padding-left: 30px;
+    padding-left: 0px !important;
+}
+
+.tunnelName {
+    padding-left: 30px !important;
 }
 
 #clientTunnels tr, #serverTunnels tr, .tunnelConfig tr {
diff --git a/installer/resources/themes/console/light/i2ptunnel.css b/installer/resources/themes/console/light/i2ptunnel.css
index 6bcfec8465..a64044be66 100644
--- a/installer/resources/themes/console/light/i2ptunnel.css
+++ b/installer/resources/themes/console/light/i2ptunnel.css
@@ -538,6 +538,10 @@ html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbod
     padding-left: 0px !important;
 }
 
+.tunnelName {
+    padding-left: 30px !important;
+}
+
 .tunnelProperties {
      background: #fafaff !important;
 }