diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc66aecf4e3..6d4d298bfb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We replaced "SearchAll" in Web Search by "Search Selected". [#10556](https://github.com/JabRef/jabref/issues/10556)
 - Short DOI formatter now checks, if the value is already formatted. If so, it returns the value instead of calling the ShortDOIService again. [#10589](https://github.com/JabRef/jabref/issues/10589)
 - We upgraded to JavaFX 21.0.1. As a consequence JabRef requires now macOS 11 or later and GTK 3.8 or later on Linux [10627](https://github.com/JabRef/jabref/pull/10627).
+- A user-specific comment fields is not enabled by default, but can be enabled using the "Add" button. [#10424](https://github.com/JabRef/jabref/issues/10424)
 - We upgraded to Lucene 9.9 for the fulltext search. The search index will be rebuild. [#10686](https://github.com/JabRef/jabref/pull/10686)
 
 ### Fixed
diff --git a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
index 269ab381a83..dc4434ce5d4 100644
--- a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
@@ -1,16 +1,25 @@
 package org.jabref.gui.entryeditor;
 
+import java.util.Comparator;
 import java.util.LinkedHashSet;
 import java.util.Map;
-import java.util.Set;
+import java.util.Optional;
+import java.util.SequencedSet;
 import java.util.stream.Collectors;
 
 import javax.swing.undo.UndoManager;
 
+import javafx.collections.ObservableList;
+import javafx.geometry.VPos;
+import javafx.scene.control.Button;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.RowConstraints;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.fieldeditors.FieldEditorFX;
+import org.jabref.gui.fieldeditors.FieldNameLabel;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
@@ -28,6 +37,10 @@ public class CommentsTab extends FieldsEditorTab {
     public static final String NAME = "Comments";
 
     private final String defaultOwner;
+    private final UserSpecificCommentField userSpecificCommentField;
+
+    private final EntryEditorPreferences entryEditorPreferences;
+
     public CommentsTab(PreferencesService preferences,
                        BibDatabaseContext databaseContext,
                        SuggestionProviders suggestionProviders,
@@ -54,38 +67,89 @@ public CommentsTab(PreferencesService preferences,
         this.defaultOwner = preferences.getOwnerPreferences().getDefaultOwner();
         setText(Localization.lang("Comments"));
         setGraphic(IconTheme.JabRefIcons.COMMENT.getGraphicNode());
+
+        userSpecificCommentField = new UserSpecificCommentField(defaultOwner);
+        entryEditorPreferences = preferences.getEntryEditorPreferences();
     }
 
     @Override
-    protected Set<Field> determineFieldsToShow(BibEntry entry) {
-        UserSpecificCommentField defaultCommentField = new UserSpecificCommentField(defaultOwner);
+    protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
+        SequencedSet<Field> comments = new LinkedHashSet<>();
 
-        // As default: Show BibTeX comment field and the user-specific comment field of the default owner
-        Set<Field> comments = new LinkedHashSet<>(Set.of(defaultCommentField, StandardField.COMMENT));
+        // First comes the standard comment field
+        comments.add(StandardField.COMMENT);
 
-        comments.addAll(entry.getFields().stream()
-                             .filter(field -> field instanceof UserSpecificCommentField ||
-                                     field.getName().toLowerCase().contains("comment"))
-                             .collect(Collectors.toSet()));
+        // Also show comment field of the current user (if enabled in the preferences)
+        if (entry.hasField(userSpecificCommentField) || entryEditorPreferences.shouldShowUserCommentsFields()) {
+            comments.add(userSpecificCommentField);
+        }
 
+        // Show all non-empty comment fields (otherwise, they are completely hidden)
+        comments.addAll(entry.getFields().stream()
+                .filter(field -> (field instanceof UserSpecificCommentField && !field.equals(userSpecificCommentField))
+                        || field.getName().toLowerCase().contains("comment"))
+                .sorted(Comparator.comparing(Field::getName))
+                .collect(Collectors.toCollection(LinkedHashSet::new)));
         return comments;
     }
 
+    /**
+     * Comment editors: three times size of button
+     */
+    private void setCompressedRowLayout() {
+        int numberOfComments = gridPane.getRowCount() - 1;
+        double totalWeight = numberOfComments * 3 + 1;
+
+        RowConstraints commentConstraint = new RowConstraints();
+        commentConstraint.setVgrow(Priority.ALWAYS);
+        commentConstraint.setValignment(VPos.TOP);
+        double commentHeightPercent = 3.0 / totalWeight * 100.0;
+        commentConstraint.setPercentHeight(commentHeightPercent);
+
+        RowConstraints buttonConstraint = new RowConstraints();
+        buttonConstraint.setVgrow(Priority.ALWAYS);
+        buttonConstraint.setValignment(VPos.TOP);
+        double addButtonHeightPercent = 1.0 / totalWeight * 100.0;
+        buttonConstraint.setPercentHeight(addButtonHeightPercent);
+
+        ObservableList<RowConstraints> rowConstraints = gridPane.getRowConstraints();
+        rowConstraints.clear();
+        for (int i = 1; i <= numberOfComments; i++) {
+            rowConstraints.add(commentConstraint);
+        }
+        rowConstraints.add(buttonConstraint);
+    }
+
     @Override
     protected void setupPanel(BibEntry entry, boolean compressed) {
         super.setupPanel(entry, compressed);
 
+        Optional<FieldEditorFX> fieldEditorForUserDefinedComment = editors.entrySet().stream().filter(f -> f.getKey().getName().contains(defaultOwner)).map(Map.Entry::getValue).findFirst();
         for (Map.Entry<Field, FieldEditorFX> fieldEditorEntry : editors.entrySet()) {
             Field field = fieldEditorEntry.getKey();
             FieldEditorFX editor = fieldEditorEntry.getValue();
 
-            if (field instanceof UserSpecificCommentField) {
-                if (field.getName().contains(defaultOwner)) {
-                    editor.getNode().setDisable(false);
-                }
-            } else {
-                editor.getNode().setDisable(!field.getName().equals(StandardField.COMMENT.getName()));
-            }
+            boolean isStandardBibtexComment = field == StandardField.COMMENT;
+            boolean isDefaultOwnerComment = field.equals(userSpecificCommentField);
+            boolean shouldBeEnabled = isStandardBibtexComment || isDefaultOwnerComment;
+            editor.getNode().setDisable(!shouldBeEnabled);
+        }
+
+        // Show "Hide" button only if user-specific comment field is empty. Otherwise, it is a strange UI, because the
+        // button would just disappear and no change **in the current** editor would be made
+        if (entryEditorPreferences.shouldShowUserCommentsFields() && !entry.hasField(userSpecificCommentField)) {
+            Button hideDefaultOwnerCommentButton = new Button(Localization.lang("Hide user comments"));
+            hideDefaultOwnerCommentButton.setOnAction(e -> {
+                var labelForField = gridPane.getChildren().stream().filter(s -> s instanceof FieldNameLabel).filter(x -> ((FieldNameLabel) x).getText().equals(userSpecificCommentField.getDisplayName())).findFirst();
+                labelForField.ifPresent(label -> gridPane.getChildren().remove(label));
+                fieldEditorForUserDefinedComment.ifPresent(f -> gridPane.getChildren().remove(f.getNode()));
+                editors.remove(userSpecificCommentField);
+
+                entryEditorPreferences.setShowUserCommentsFields(false);
+                setupPanel(entry, false);
+            });
+            gridPane.add(hideDefaultOwnerCommentButton, 1, gridPane.getRowCount(), 2, 1);
+            setCompressedRowLayout();
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
index a40302d54c6..ca15fe49b7c 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
@@ -1,8 +1,8 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.Optional;
-import java.util.Set;
+import java.util.SequencedSet;
 import java.util.stream.Collectors;
 
 import javax.swing.undo.UndoManager;
@@ -59,14 +59,14 @@ public DeprecatedFieldsTab(BibDatabaseContext databaseContext,
     }
 
     @Override
-    protected Set<Field> determineFieldsToShow(BibEntry entry) {
+    protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
         BibDatabaseMode mode = databaseContext.getMode();
         Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), mode);
         if (entryType.isPresent()) {
-            return entryType.get().getDeprecatedFields(mode).stream().filter(field -> !entry.getField(field).isEmpty()).collect(Collectors.toSet());
+            return entryType.get().getDeprecatedFields(mode).stream().filter(field -> !entry.getField(field).isEmpty()).collect(Collectors.toCollection(LinkedHashSet::new));
         } else {
-            // Entry type unknown -> treat all fields as required
-            return Collections.emptySet();
+            // Entry type unknown -> treat all fields as required (thus no optional fields)
+            return new LinkedHashSet<>();
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
index c2afea3b0af..ae0fda0194c 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
@@ -48,6 +48,7 @@ public static JournalPopupEnabled fromString(String status) {
     private final BooleanProperty autoLinkFiles;
     private final ObjectProperty<JournalPopupEnabled> enablementStatus;
     private final BooleanProperty shouldShowSciteTab;
+    private final BooleanProperty showUserCommentsFields;
 
     public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
                                   Map<String, Set<Field>> defaultEntryEditorTabList,
@@ -60,7 +61,8 @@ public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
                                   double dividerPosition,
                                   boolean autolinkFilesEnabled,
                                   JournalPopupEnabled journalPopupEnabled,
-                                  boolean showSciteTab) {
+                                  boolean showSciteTab,
+                                  boolean showUserCommentsFields) {
 
         this.entryEditorTabList = new SimpleMapProperty<>(FXCollections.observableMap(entryEditorTabList));
         this.defaultEntryEditorTabList = new SimpleMapProperty<>(FXCollections.observableMap(defaultEntryEditorTabList));
@@ -74,6 +76,7 @@ public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
         this.autoLinkFiles = new SimpleBooleanProperty(autolinkFilesEnabled);
         this.enablementStatus = new SimpleObjectProperty<>(journalPopupEnabled);
         this.shouldShowSciteTab = new SimpleBooleanProperty(showSciteTab);
+        this.showUserCommentsFields = new SimpleBooleanProperty(showUserCommentsFields);
     }
 
     public ObservableMap<String, Set<Field>> getEntryEditorTabs() {
@@ -211,4 +214,16 @@ public BooleanProperty shouldShowLSciteTabProperty() {
     public void setShouldShowSciteTab(boolean shouldShowSciteTab) {
         this.shouldShowSciteTab.set(shouldShowSciteTab);
     }
+
+    public boolean shouldShowUserCommentsFields() {
+        return showUserCommentsFields.get();
+    }
+
+    public BooleanProperty showUserCommentsFieldsProperty() {
+        return showUserCommentsFields;
+    }
+
+    public void setShowUserCommentsFields(boolean showUserCommentsFields) {
+        this.showUserCommentsFields.set(showUserCommentsFields);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 780af05c3c4..bdaf404b4c1 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -6,11 +6,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
+import java.util.SequencedSet;
 import java.util.stream.Stream;
 
 import javax.swing.undo.UndoManager;
 
+import javafx.collections.ObservableList;
 import javafx.geometry.VPos;
 import javafx.scene.Node;
 import javafx.scene.Parent;
@@ -47,6 +48,7 @@
 abstract class FieldsEditorTab extends EntryEditorTab {
     protected final BibDatabaseContext databaseContext;
     protected final Map<Field, FieldEditorFX> editors = new LinkedHashMap<>();
+    protected GridPane gridPane;
     private final boolean isCompressed;
     private final SuggestionProviders suggestionProviders;
     private final DialogService dialogService;
@@ -59,7 +61,6 @@ abstract class FieldsEditorTab extends EntryEditorTab {
     private PreviewPanel previewPanel;
     private final UndoManager undoManager;
     private Collection<Field> fields = new ArrayList<>();
-    private GridPane gridPane;
 
     public FieldsEditorTab(boolean compressed,
                            BibDatabaseContext databaseContext,
@@ -107,36 +108,22 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
 
         fields = determineFieldsToShow(entry);
 
-        List<Label> labels = new ArrayList<>();
-        for (Field field : fields) {
-            FieldEditorFX fieldEditor = FieldEditors.getForField(
-                    field,
-                    taskExecutor,
-                    dialogService,
-                    journalAbbreviationRepository,
-                    preferences,
-                    databaseContext,
-                    entry.getType(),
-                    suggestionProviders,
-                    undoManager);
-            fieldEditor.bindToEntry(entry);
-
-            editors.put(field, fieldEditor);
-            labels.add(new FieldNameLabel(field));
-        }
+        List<Label> labels = fields
+                .stream()
+                .map(field -> createLabelAndEditor(entry, field))
+                .toList();
 
         ColumnConstraints columnExpand = new ColumnConstraints();
         columnExpand.setHgrow(Priority.ALWAYS);
 
         ColumnConstraints columnDoNotContract = new ColumnConstraints();
         columnDoNotContract.setMinWidth(Region.USE_PREF_SIZE);
-        int rows;
         if (compressed) {
-            rows = (int) Math.ceil((double) fields.size() / 2);
+            int rows = (int) Math.ceil((double) fields.size() / 2);
 
             addColumn(gridPane, 0, labels.subList(0, rows));
-            addColumn(gridPane, 3, labels.subList(rows, labels.size()));
             addColumn(gridPane, 1, editors.values().stream().map(FieldEditorFX::getNode).limit(rows));
+            addColumn(gridPane, 3, labels.subList(rows, labels.size()));
             addColumn(gridPane, 4, editors.values().stream().map(FieldEditorFX::getNode).skip(rows));
 
             columnExpand.setPercentWidth(40);
@@ -154,23 +141,39 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
         }
     }
 
+    protected Label createLabelAndEditor(BibEntry entry, Field field) {
+        FieldEditorFX fieldEditor = FieldEditors.getForField(
+                field,
+                taskExecutor,
+                dialogService,
+                journalAbbreviationRepository,
+                preferences,
+                databaseContext,
+                entry.getType(),
+                suggestionProviders,
+                undoManager);
+        fieldEditor.bindToEntry(entry);
+        editors.put(field, fieldEditor);
+        return new FieldNameLabel(field);
+    }
+
     private void setRegularRowLayout(GridPane gridPane) {
         double totalWeight = fields.stream()
                                    .mapToDouble(field -> editors.get(field).getWeight())
                                    .sum();
-
-        List<RowConstraints> constraints = new ArrayList<>();
-        for (Field field : fields) {
-            RowConstraints rowExpand = new RowConstraints();
-            rowExpand.setVgrow(Priority.ALWAYS);
-            rowExpand.setValignment(VPos.TOP);
-            rowExpand.setPercentHeight(100 * editors.get(field).getWeight() / totalWeight);
-            constraints.add(rowExpand);
-        }
+        List<RowConstraints> constraints = fields
+                .stream()
+                .map(field -> {
+                    RowConstraints rowExpand = new RowConstraints();
+                    rowExpand.setVgrow(Priority.ALWAYS);
+                    rowExpand.setValignment(VPos.TOP);
+                    rowExpand.setPercentHeight(100 * editors.get(field).getWeight() / totalWeight);
+                    return rowExpand;
+                }).toList();
         gridPane.getRowConstraints().addAll(constraints);
     }
 
-    private void setCompressedRowLayout(GridPane gridPane, int rows) {
+    protected static void setCompressedRowLayout(GridPane gridPane, int rows) {
         RowConstraints rowExpand = new RowConstraints();
         rowExpand.setVgrow(Priority.ALWAYS);
         rowExpand.setValignment(VPos.TOP);
@@ -179,8 +182,11 @@ private void setCompressedRowLayout(GridPane gridPane, int rows) {
         } else {
             rowExpand.setPercentHeight(100 / (double) rows);
         }
+
+        ObservableList<RowConstraints> rowConstraints = gridPane.getRowConstraints();
+        rowConstraints.clear();
         for (int i = 0; i < rows; i++) {
-            gridPane.getRowConstraints().add(rowExpand);
+            rowConstraints.add(rowExpand);
         }
     }
 
@@ -218,7 +224,7 @@ protected void previousPreviewStyle() {
         }
     }
 
-    protected abstract Set<Field> determineFieldsToShow(BibEntry entry);
+    protected abstract SequencedSet<Field> determineFieldsToShow(BibEntry entry);
 
     public Collection<Field> getShownFields() {
         return fields;
@@ -229,7 +235,7 @@ private void initPanel() {
             gridPane = new GridPane();
             gridPane.getStyleClass().add("editorPane");
 
-            // Warp everything in a scroll-pane
+            // Wrap everything in a scroll-pane
             ScrollPane scrollPane = new ScrollPane();
             scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
             scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
index edb22834ff2..2bfdc10b92b 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
@@ -1,8 +1,8 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.Optional;
-import java.util.Set;
+import java.util.SequencedSet;
 
 import javax.swing.undo.UndoManager;
 
@@ -61,7 +61,7 @@ public OptionalFieldsTabBase(String title,
     }
 
     @Override
-    protected Set<Field> determineFieldsToShow(BibEntry entry) {
+    protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
         BibDatabaseMode mode = databaseContext.getMode();
         Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), mode);
         if (entryType.isPresent()) {
@@ -71,8 +71,8 @@ protected Set<Field> determineFieldsToShow(BibEntry entry) {
                 return entryType.get().getSecondaryOptionalNotDeprecatedFields(mode);
             }
         } else {
-            // Entry type unknown -> treat all fields as required
-            return Collections.emptySet();
+            // Entry type unknown -> treat all fields as required (thus no optional fields)
+            return new LinkedHashSet<>();
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
index dae09c7a2a3..ed388027b69 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.entryeditor;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.SequencedSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -72,23 +72,23 @@ public OtherFieldsTab(BibDatabaseContext databaseContext,
     }
 
     @Override
-    protected Set<Field> determineFieldsToShow(BibEntry entry) {
+    protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
         BibDatabaseMode mode = databaseContext.getMode();
         Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), mode);
         if (entryType.isPresent()) {
             Set<Field> allKnownFields = entryType.get().getAllFields();
-            Set<Field> otherFields = entry.getFields().stream()
+            SequencedSet<Field> otherFields = entry.getFields().stream()
                                           .filter(field -> !allKnownFields.contains(field) &&
                                                   !(field.equals(StandardField.COMMENT) || field instanceof UserSpecificCommentField))
                                           .collect(Collectors.toCollection(LinkedHashSet::new));
             otherFields.removeAll(entryType.get().getDeprecatedFields(mode));
-            otherFields.removeAll(entryType.get().getOptionalFields().stream().map(BibField::field).collect(Collectors.toSet()));
+            otherFields.removeAll(entryType.get().getOptionalFields().stream().map(BibField::field).toList());
             otherFields.remove(InternalField.KEY_FIELD);
             customTabFieldNames.forEach(otherFields::remove);
             return otherFields;
         } else {
-            // Entry type unknown -> treat all fields as required
-            return Collections.emptySet();
+            // Entry type unknown -> treat all fields as required (thus no other fields)
+            return new LinkedHashSet<>();
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
index cfc530c9d08..fb856f62f5e 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
@@ -2,7 +2,7 @@
 
 import java.util.LinkedHashSet;
 import java.util.Optional;
-import java.util.Set;
+import java.util.SequencedSet;
 
 import javax.swing.undo.UndoManager;
 
@@ -51,9 +51,9 @@ public RequiredFieldsTab(BibDatabaseContext databaseContext,
     }
 
     @Override
-    protected Set<Field> determineFieldsToShow(BibEntry entry) {
+    protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
         Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
-        Set<Field> fields = new LinkedHashSet<>();
+        SequencedSet<Field> fields = new LinkedHashSet<>();
         if (entryType.isPresent()) {
             for (OrFields orFields : entryType.get().getRequiredFields()) {
                 fields.addAll(orFields.getFields());
diff --git a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
index aa4e65b48e3..ce94dcca516 100644
--- a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.entryeditor;
 
 import java.util.LinkedHashSet;
+import java.util.SequencedSet;
 import java.util.Set;
 
 import javax.swing.undo.UndoManager;
@@ -42,7 +43,7 @@ public UserDefinedFieldsTab(String name,
     }
 
     @Override
-    protected Set<Field> determineFieldsToShow(BibEntry entry) {
+    protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
         return fields;
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
index 85b787fd4cb..940f8cff5cc 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
@@ -21,7 +21,9 @@
 
     <CheckBox fx:id="openOnNewEntry" text="%Open editor when a new entry is created"/>
     <CheckBox fx:id="defaultSource" text="%Show BibTeX source by default"/>
-    <CheckBox fx:id="autoLinkFilesEnabled" text="%Automatically search and show unlinked files in the entry editor"></CheckBox>
+    <CheckBox
+            fx:id="autoLinkFilesEnabled"
+            text="%Automatically search and show unlinked files in the entry editor"/>
 
     <CheckBox fx:id="enableRelatedArticlesTab" text="%Show 'Related Articles' tab"/>
     <CheckBox fx:id="acceptRecommendations" text="%Accept recommendations from Mr. DLib"
@@ -35,6 +37,7 @@
     <CheckBox fx:id="allowIntegerEdition" text="%Allow integers in 'edition' field in BibTeX mode"/>
     <CheckBox fx:id="journalPopupEnabled" text="%Fetch journal information online to show"/>
     <CheckBox fx:id="enableSciteTab" text="%Show 'Scite' tab"/>
+    <CheckBox fx:id="showUserCommentsField" text="%Show user comments field"/>
 
     <Label styleClass="sectionHeader" text="%Custom editor tabs"/>
     <HBox>
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
index b2bf2b93d4d..5e5d35cf228 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
@@ -29,6 +29,7 @@ public class EntryEditorTab extends AbstractPreferenceTabView<EntryEditorTabView
     @FXML private CheckBox journalPopupEnabled;
     @FXML private CheckBox autoLinkFilesEnabled;
     @FXML private CheckBox enableSciteTab;
+    @FXML private CheckBox showUserCommentsField;
 
     @FXML private Button generalFieldsHelp;
     @FXML private TextArea fieldsTextArea;
@@ -59,6 +60,7 @@ public void initialize() {
         journalPopupEnabled.selectedProperty().bindBidirectional(viewModel.journalPopupProperty());
         autoLinkFilesEnabled.selectedProperty().bindBidirectional(viewModel.autoLinkFilesEnabledProperty());
         enableSciteTab.selectedProperty().bindBidirectional(viewModel.enableSciteTabProperty());
+        showUserCommentsField.selectedProperty().bindBidirectional(viewModel.showUserCommentsProperty());
 
         fieldsTextArea.textProperty().bindBidirectional(viewModel.fieldsProperty());
 
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
index b31dcb12582..e520a4fdeb0 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
@@ -32,6 +32,8 @@ public class EntryEditorTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty autoLinkEnabledProperty = new SimpleBooleanProperty();
     private final BooleanProperty enableSciteTabProperty = new SimpleBooleanProperty();
 
+    private final BooleanProperty showUserCommentsProperty = new SimpleBooleanProperty();
+
     private final StringProperty fieldsProperty = new SimpleStringProperty();
 
     private final DialogService dialogService;
@@ -61,6 +63,7 @@ public void setValues() {
         journalPopupProperty.setValue(entryEditorPreferences.shouldEnableJournalPopup() == EntryEditorPreferences.JournalPopupEnabled.ENABLED);
         autoLinkEnabledProperty.setValue(entryEditorPreferences.autoLinkFilesEnabled());
         enableSciteTabProperty.setValue(entryEditorPreferences.shouldShowSciteTab());
+        showUserCommentsProperty.setValue(entryEditorPreferences.shouldShowUserCommentsFields());
 
         setFields(entryEditorPreferences.getEntryEditorTabs());
     }
@@ -98,6 +101,7 @@ public void storeSettings() {
         // entryEditorPreferences.setDividerPosition();
         entryEditorPreferences.setAutoLinkFilesEnabled(autoLinkEnabledProperty.getValue());
         entryEditorPreferences.setShouldShowSciteTab(enableSciteTabProperty.getValue());
+        entryEditorPreferences.setShowUserCommentsFields(showUserCommentsProperty.getValue());
 
         Map<String, Set<Field>> customTabsMap = new LinkedHashMap<>();
         String[] lines = fieldsProperty.get().split("\n");
@@ -173,4 +177,8 @@ public BooleanProperty autoLinkFilesEnabledProperty() {
     public BooleanProperty enableSciteTabProperty() {
         return enableSciteTabProperty;
     }
+
+    public BooleanProperty showUserCommentsProperty() {
+        return this.showUserCommentsProperty;
+    }
 }
diff --git a/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java b/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
index 2310a7c6b25..85b20dd3eec 100644
--- a/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
+++ b/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
-import java.util.Set;
+import java.util.SequencedCollection;
 import java.util.stream.Collectors;
 
 import org.jabref.logic.formatter.bibtexfields.RemoveNewlinesFormatter;
@@ -149,8 +149,13 @@ private CSLItemData bibEntryToCSLItemData(BibEntry originalBibEntry, BibDatabase
             }
         }
 
-        Set<Field> fields = new LinkedHashSet<>(entryType.map(BibEntryType::getAllFields).orElse(bibEntry.getFields()));
-        fields.addAll(bibEntry.getFields());
+        SequencedCollection<Field> fields;
+        if (entryType.isPresent()) {
+            fields = entryType.map(BibEntryType::getAllFields).map(LinkedHashSet::new).get();
+            fields.addAll(bibEntry.getFields());
+        } else {
+            fields = bibEntry.getFields();
+        }
         for (Field key : fields) {
             bibEntry.getResolvedFieldOrAlias(key, bibDatabaseContext.getDatabase())
                     .map(removeNewlinesFormatter::format)
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index c5590a1348a..2b7519438eb 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -6,10 +6,12 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.SequencedSet;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
@@ -434,12 +436,10 @@ public Optional<FieldChange> setType(EntryType newType, EntriesEventSource event
     }
 
     /**
-     * Returns an {@link Collections#unmodifiableSet(Set)} containing the names of all fields that are set for this particular entry.
-     *
-     * @return a set of existing field names
+     * Returns an unmodifiable sequence containing the names of all fields that are set for this particular entry.
      */
-    public Set<Field> getFields() {
-        return Collections.unmodifiableSet(fields.keySet());
+    public SequencedSet<Field> getFields() {
+        return new LinkedHashSet<>(fields.keySet());
     }
 
     /**
diff --git a/src/main/java/org/jabref/model/entry/BibEntryType.java b/src/main/java/org/jabref/model/entry/BibEntryType.java
index 4908aec875c..b58a9e89098 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryType.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryType.java
@@ -4,6 +4,7 @@
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Objects;
+import java.util.SequencedSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -75,25 +76,25 @@ public Set<Field> getAllFields() {
         return fields.stream().map(BibField::field).collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
-    public Set<Field> getPrimaryOptionalFields() {
+    public SequencedSet<Field> getPrimaryOptionalFields() {
         return getOptionalFields().stream()
                                   .filter(field -> field.priority() == FieldPriority.IMPORTANT)
                                   .map(BibField::field)
                                   .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
-    public Set<Field> getSecondaryOptionalFields() {
+    public SequencedSet<Field> getSecondaryOptionalFields() {
         return getOptionalFields().stream()
                                   .filter(field -> field.priority() == FieldPriority.DETAIL)
                                   .map(BibField::field)
                                   .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
-    public Set<Field> getDeprecatedFields(BibDatabaseMode mode) {
+    public SequencedSet<Field> getDeprecatedFields(BibDatabaseMode mode) {
         if (mode == BibDatabaseMode.BIBTEX) {
-            return Collections.emptySet();
+            return new LinkedHashSet<>();
         }
-        Set<Field> deprecatedFields = new LinkedHashSet<>(EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.keySet());
+        SequencedSet<Field> deprecatedFields = new LinkedHashSet<>(EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.keySet());
 
         // Only the optional fields which are mapped to another BibLaTeX name should be shown as "deprecated"
         deprecatedFields.retainAll(getOptionalFieldsAndAliases());
@@ -106,8 +107,8 @@ public Set<Field> getDeprecatedFields(BibDatabaseMode mode) {
         return deprecatedFields;
     }
 
-    public Set<Field> getSecondaryOptionalNotDeprecatedFields(BibDatabaseMode mode) {
-        Set<Field> optionalFieldsNotPrimaryOrDeprecated = new LinkedHashSet<>(getSecondaryOptionalFields());
+    public SequencedSet<Field> getSecondaryOptionalNotDeprecatedFields(BibDatabaseMode mode) {
+        SequencedSet<Field> optionalFieldsNotPrimaryOrDeprecated = new LinkedHashSet<>(getSecondaryOptionalFields());
         optionalFieldsNotPrimaryOrDeprecated.removeAll(getDeprecatedFields(mode));
         return optionalFieldsNotPrimaryOrDeprecated;
     }
@@ -115,8 +116,8 @@ public Set<Field> getSecondaryOptionalNotDeprecatedFields(BibDatabaseMode mode)
     /**
      * Get list of all optional fields of this entry and all fields being source for a BibTeX to BibLaTeX conversion.
      */
-    private Set<Field> getOptionalFieldsAndAliases() {
-        Set<Field> optionalFieldsAndAliases = new LinkedHashSet<>(getOptionalFields().size());
+    private SequencedSet<Field> getOptionalFieldsAndAliases() {
+        SequencedSet<Field> optionalFieldsAndAliases = new LinkedHashSet<>(getOptionalFields().size());
         for (BibField field : getOptionalFields()) {
             optionalFieldsAndAliases.add(field.field());
             if (EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.containsKey(field.field())) {
diff --git a/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java b/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java
index 56e45b7d11a..f56e61aceb1 100644
--- a/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java
+++ b/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java
@@ -32,10 +32,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof Field)) {
+        if (!(o instanceof Field other)) {
             return false;
         }
-        Field other = (Field) o;
         return name.equals(other.getName());
     }
 
diff --git a/src/main/java/org/jabref/preferences/GuiPreferences.java b/src/main/java/org/jabref/preferences/GuiPreferences.java
index 06a948741a1..479889efdc0 100644
--- a/src/main/java/org/jabref/preferences/GuiPreferences.java
+++ b/src/main/java/org/jabref/preferences/GuiPreferences.java
@@ -246,12 +246,4 @@ public void setSidePaneWidth(double sidePaneWidth) {
     public BooleanProperty mergeShowChangedFieldOnlyProperty() {
         return mergeShowChangedFieldsOnly;
     }
-
-    public boolean isMergeShowChangedFieldsOnly() {
-        return mergeShowChangedFieldsOnly.getValue();
-    }
-
-    public void setIsMergedShowChangedFielsOnly(boolean showChangedFieldsOnly) {
-        mergeShowChangedFieldsOnly.setValue(showChangedFieldsOnly);
-    }
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index e76d61223ff..28070ab4ed7 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -257,6 +257,8 @@ public class JabRefPreferences implements PreferencesService {
 
     public static final String MERGE_SHOW_ONLY_CHANGED_FIELDS = "mergeShowOnlyChangedFields";
 
+    public static final String SHOW_USER_COMMENTS_FIELDS = "showUserCommentsFields";
+
     public static final String CUSTOM_EXPORT_FORMAT = "customExportFormat";
     public static final String CUSTOM_IMPORT_FORMAT = "customImportFormat";
     public static final String KEY_PATTERN_REGEX = "KeyPatternRegex";
@@ -638,6 +640,8 @@ private JabRefPreferences() {
         defaults.put(MERGE_ENTRIES_HIGHLIGHT_WORDS, Boolean.TRUE);
         defaults.put(MERGE_SHOW_ONLY_CHANGED_FIELDS, Boolean.FALSE);
 
+        defaults.put(SHOW_USER_COMMENTS_FIELDS, Boolean.TRUE);
+
         defaults.put(SHOW_RECOMMENDATIONS, Boolean.TRUE);
         defaults.put(ACCEPT_RECOMMENDATIONS, Boolean.FALSE);
         defaults.put(SHOW_LATEX_CITATIONS, Boolean.TRUE);
@@ -891,7 +895,7 @@ private static Optional<String> getNextUnit(Reader data) throws IOException {
                 escape = false;
             }
         }
-        if (res.length() > 0) {
+        if (!res.isEmpty()) {
             return Optional.of(res.toString());
         } else if (c == -1) {
             // end of stream
@@ -1452,7 +1456,8 @@ public EntryEditorPreferences getEntryEditorPreferences() {
                 getDouble(ENTRY_EDITOR_HEIGHT),
                 getBoolean(AUTOLINK_FILES_ENABLED),
                 EntryEditorPreferences.JournalPopupEnabled.fromString(get(JOURNAL_POPUP)),
-                getBoolean(SHOW_SCITE_TAB));
+                getBoolean(SHOW_SCITE_TAB),
+                getBoolean(SHOW_USER_COMMENTS_FIELDS));
 
         EasyBind.listen(entryEditorPreferences.entryEditorTabs(), (obs, oldValue, newValue) -> storeEntryEditorTabs(newValue));
         // defaultEntryEditorTabs are read-only
@@ -1466,6 +1471,7 @@ public EntryEditorPreferences getEntryEditorPreferences() {
         EasyBind.listen(entryEditorPreferences.autoLinkEnabledProperty(), (obs, oldValue, newValue) -> putBoolean(AUTOLINK_FILES_ENABLED, newValue));
         EasyBind.listen(entryEditorPreferences.enableJournalPopupProperty(), (obs, oldValue, newValue) -> put(JOURNAL_POPUP, newValue.toString()));
         EasyBind.listen(entryEditorPreferences.shouldShowLSciteTabProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_SCITE_TAB, newValue));
+        EasyBind.listen(entryEditorPreferences.showUserCommentsFieldsProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_USER_COMMENTS_FIELDS, newValue));
 
         return entryEditorPreferences;
     }
@@ -2612,7 +2618,6 @@ public GuiPreferences getGuiPreferences() {
         EasyBind.listen(guiPreferences.mergeHighlightWordsProperty(), (obs, oldValue, newValue) -> putBoolean(MERGE_ENTRIES_HIGHLIGHT_WORDS, newValue));
         EasyBind.listen(guiPreferences.sidePaneWidthProperty(), (obs, oldValue, newValue) -> putDouble(SIDE_PANE_WIDTH, newValue.doubleValue()));
         EasyBind.listen(guiPreferences.mergeShowChangedFieldOnlyProperty(), (obs, oldValue, newValue) -> putBoolean(MERGE_SHOW_ONLY_CHANGED_FIELDS, newValue));
-
         return guiPreferences;
     }
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index bb5a2f40c7d..7ea2dceb5e7 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2621,4 +2621,8 @@ Would\ you\ like\ to\ enable\ fetching\ of\ journal\ information?\ This\ can\ be
 Enable=Enable
 Keep\ disabled=Keep disabled
 
+  
+Hide\ user\ comments=Hide user comments
+Show\ user\ comments\ field=Show user comments field
+
 More\ options...=More options...
diff --git a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
index 1d255cf7536..06a4cfc361f 100644
--- a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.entryeditor;
 
 import java.util.Optional;
+import java.util.SequencedSet;
 import java.util.Set;
 
 import javax.swing.undo.UndoManager;
@@ -28,6 +29,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.testfx.framework.junit5.ApplicationExtension;
@@ -71,12 +74,17 @@ class CommentsTabTest {
     @Mock
     private OwnerPreferences ownerPreferences;
 
+    @Mock
+    private EntryEditorPreferences entryEditorPreferences;
+
     @BeforeEach
     void setUp() {
         MockitoAnnotations.initMocks(this);
 
         when(preferences.getOwnerPreferences()).thenReturn(ownerPreferences);
         when(ownerPreferences.getDefaultOwner()).thenReturn(ownerName);
+        when(preferences.getEntryEditorPreferences()).thenReturn(entryEditorPreferences);
+        when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(true);
         when(databaseContext.getMode()).thenReturn(BibDatabaseMode.BIBLATEX);
         BibEntryType entryTypeMock = mock(BibEntryType.class);
         when(entryTypesManager.enrich(any(), any())).thenReturn(Optional.of(entryTypeMock));
@@ -96,14 +104,41 @@ void setUp() {
     }
 
     @Test
-    void testDetermineFieldsToShowWorksForASingleUser() {
+    void emptyCommentShownIfGloballyEnabled() {
+        final UserSpecificCommentField ownerComment = new UserSpecificCommentField(ownerName);
+        when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(true);
+
+        BibEntry entry = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.COMMENT, "Standard comment text");
+
+        SequencedSet<Field> fields = commentsTab.determineFieldsToShow(entry);
+
+        assertEquals(Set.of(StandardField.COMMENT, ownerComment), fields);
+    }
+
+    @Test
+    void emptyCommentFieldNotShownIfGloballyDisabled() {
+        when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(false);
+
+        BibEntry entry = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.COMMENT, "Standard comment text");
+
+        SequencedSet<Field> fields = commentsTab.determineFieldsToShow(entry);
+
+        assertEquals(Set.of(StandardField.COMMENT), fields);
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void commentFieldShownIfContainsText(boolean shouldShowUserCommentsFields) {
         final UserSpecificCommentField ownerComment = new UserSpecificCommentField(ownerName);
+        when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(shouldShowUserCommentsFields);
 
         BibEntry entry = new BibEntry(StandardEntryType.Book)
                 .withField(StandardField.COMMENT, "Standard comment text")
                 .withField(ownerComment, "User-specific comment text");
 
-        Set<Field> fields = commentsTab.determineFieldsToShow(entry);
+        SequencedSet<Field> fields = commentsTab.determineFieldsToShow(entry);
 
         assertEquals(Set.of(StandardField.COMMENT, ownerComment), fields);
     }
@@ -118,7 +153,7 @@ void testDetermineFieldsToShowWorksForMultipleUsers() {
                 .withField(ownerComment, "User-specific comment text")
                 .withField(otherUsersComment, "other-user-id comment text");
 
-        Set<Field> fields = commentsTab.determineFieldsToShow(entry);
+        SequencedSet<Field> fields = commentsTab.determineFieldsToShow(entry);
 
         assertEquals(Set.of(StandardField.COMMENT, ownerComment, otherUsersComment), fields);
     }