diff --git a/api/js/etemplate/Et2Nextmatch/ColumnSelection.ts b/api/js/etemplate/Et2Nextmatch/ColumnSelection.ts
index 5c2f6fbc56..8230ed9d4c 100644
--- a/api/js/etemplate/Et2Nextmatch/ColumnSelection.ts
+++ b/api/js/etemplate/Et2Nextmatch/ColumnSelection.ts
@@ -132,13 +132,19 @@ export class Et2ColumnSelection extends Et2InputWidget(LitElement)
 	 */
 	protected rowTemplate(column) : TemplateResult
 	{
-		let isCustom = column.widget?.instanceOf(et2_nextmatch_customfields) || false;
-		/*     ?disabled=${column.visibility == et2_dataview_column.ET2_COL_VISIBILITY_DISABLED} */
+		const isCustom = column.widget?.instanceOf(et2_nextmatch_customfields) || false;
+		const alwaysOn = [et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS, et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT].indexOf(column.visibility) !== -1;
+
+		// Don't show disabled columns
+		if(column.visibility == et2_dataview_column.ET2_COL_VISIBILITY_DISABLED)
+		{
+			return html``;
+		}
 		return html`
             <sl-menu-item
                     value="${column.id}"
-                    ?checked=${column.visibility == et2_dataview_column.ET2_COL_VISIBILITY_VISIBLE}
-
+                    ?checked=${alwaysOn || column.visibility == et2_dataview_column.ET2_COL_VISIBILITY_VISIBLE}
+                    ?disabled=${alwaysOn}
                     title="${column.title}"
                     class="${classMap({
                         select_row: true,
diff --git a/api/js/etemplate/et2_extension_nextmatch.ts b/api/js/etemplate/et2_extension_nextmatch.ts
index c0d5fe4fe6..5d0a7dc4e7 100644
--- a/api/js/etemplate/et2_extension_nextmatch.ts
+++ b/api/js/etemplate/et2_extension_nextmatch.ts
@@ -1991,7 +1991,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
 			columns.push({
 				id: LETTERS,
 				caption: this.egw().lang('Search letter'),
-				visibility: (this.header.lettersearch.is(':visible') ? et2_dataview_column.ET2_COL_VISIBILITY_VISIBLE : et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT)
+				visibility: (this.header.lettersearch.is(':visible') ? et2_dataview_column.ET2_COL_VISIBILITY_VISIBLE : et2_dataview_column.ET2_COL_VISIBILITY_INVISIBLE)
 			});
 		}