diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index 149e336c96..45fca1874e 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -119,25 +119,7 @@ img.image-preview {
     padding-right: var(--26px);
 }
 
-.form-group.hidden-cell {
-    margin-bottom: 0;
-}
 
-.hidden-cell div.field {
-    display: none !important;
-}
-
-.hidden-cell label.control-label {
-    display: none !important;
-}
-
-.hidden-cell .inline-edit-link {
-    display: none !important;
-}
-
-.inline-edit-link + .control-label {
-    max-width: calc(100% - var(--15px));
-}
 
 .chevron-right {
     &::before {
@@ -400,44 +382,6 @@ div.list-expanded > ul > li > div.expanded-row {
         }
     }
 }
-.cell label,
-.filter label {
-    color: var(--text-muted-color);
-    font-weight: normal;
-}
-
-.cell > label,
-.filter label {
-    margin-bottom: var(--2px);
-}
-
-.cell.highlighted {
-    > label {
-        color: @state-warning-text;
-    }
-}
-
-.cell.transition {
-    > label {
-        -webkit-transition: color .5s ease;
-        -o-transition: color .5s ease;
-        transition: color .5s ease;
-    }
-}
-
-.cell .loading-value {
-    color: var(--text-muted-color);
-    user-select: none;
-
-    &:before {
-        content: "–";
-        display: inline;
-    }
-}
-
-.cell .none-value {
-    color: var(--text-gray-color);
-}
 
 .numeric-text {
     font-variant-numeric: tabular-nums;
@@ -3603,12 +3547,6 @@ table.table-admin-panel {
     margin-bottom: var(--12px);
 }
 
-@media screen and (min-width: @screen-md-min) {
-    .col-md-12.hidden-cell {
-        min-height: 0;
-    }
-}
-
 @media screen and (min-width: @screen-sm-min) {
     .search-container .view-mode-switcher-buttons-group {
         float: right;
diff --git a/frontend/less/espo/elements/form.less b/frontend/less/espo/elements/form.less
index e82a655f1f..258c1e1eb1 100644
--- a/frontend/less/espo/elements/form.less
+++ b/frontend/less/espo/elements/form.less
@@ -510,6 +510,92 @@ input[type="radio"].form-radio {
     user-select: none;
 }
 
+.form-group.hidden-cell {
+    margin-bottom: 0;
+}
+
+.hidden-cell {
+    div.field {
+        display: none !important;
+    }
+
+    label.control-label {
+        display: none !important;
+    }
+
+    .inline-edit-link {
+        display: none !important;
+    }
+}
+
+@media screen and (min-width: @screen-md-min) {
+    .col-md-12.hidden-cell {
+        min-height: 0;
+    }
+}
+
+
+.cell label,
+.filter label {
+    color: var(--text-muted-color);
+    font-weight: normal;
+}
+
+.cell > label,
+.filter label {
+    margin-bottom: var(--2px);
+}
+
+.cell {
+    &:has(.inline-edit-link) {
+        .control-label {
+            max-width: calc(100% - var(--20px));
+        }
+
+        .inline-save-link + .inline-edit-link + .control-label {
+            max-width: calc(100% - var(--50px) - var(--15px));
+        }
+
+        .control-label {
+            float: left;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+
+        .control-label + .field {
+            clear: both;
+        }
+    }
+
+    &.transition {
+        > label {
+            -webkit-transition: color .5s ease;
+            -o-transition: color .5s ease;
+            transition: color .5s ease;
+        }
+    }
+
+    &.highlighted {
+        > label {
+            color: var(--state-warning-text);
+        }
+    }
+
+    .loading-value {
+        color: var(--text-muted-color);
+        user-select: none;
+
+        &:before {
+            content: "–";
+            display: inline;
+        }
+    }
+
+    .none-value {
+        color: var(--text-gray-color);
+    }
+}
+
 select.form-control.native-select {
     &, &::picker(select) {
         appearance: base-select;