diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebb90f3c68b..0e96758c107 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 
 ### Changed
 
-- We reintroduced the possibility to extract references from plain text (using GROBID) [#5614](https://github.com/JabRef/jabref/pull/5614) 
+- We reintroduced the possibility to extract references from plain text (using GROBID) [#5614](https://github.com/JabRef/jabref/pull/5614)
 - We changed the open office panel to show buttons in rows of three instead of going straight down to save space as the button expanded out to take up unnecessary horizontal space. [#5479](https://github.com/JabRef/jabref/issues/5479)
 - We cleaned up the group add/edit dialog. [#5826](https://github.com/JabRef/jabref/pull/5826)
 - We reintroduced the index column. [#5844](https://github.com/JabRef/jabref/pull/5844)
@@ -43,6 +43,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where changing the type of an entry did not update the main table. [#5906](https://github.com/JabRef/jabref/issues/5906)
 - We fixed an issue where opening a library from the recent libraries menu was not possible. [#5939](https://github.com/JabRef/jabref/issues/5939)
 - We fixed an issue where changing entry type doesn't always work when biblatex source is shown. [#5905](https://github.com/JabRef/jabref/issues/5905)
+- We fixed an issue where the group and the link column were not updated after changing the entry in the main table. [#5985](https://github.com/JabRef/jabref/issues/5985)
 
 ### Removed
 
diff --git a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
index d7391790d7a..47e783c2d61 100644
--- a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
+++ b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
@@ -7,6 +7,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
@@ -18,6 +19,7 @@
 import org.jabref.model.entry.FileFieldParser;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.groups.AbstractGroup;
@@ -52,31 +54,33 @@ public ObservableValue<List<LinkedFile>> getLinkedFiles() {
         return EasyBind.map(getField(StandardField.FILE), FileFieldParser::parse);
     }
 
-    public ObservableValue<Map<Field,String>> getLinkedIdentifiers() {
-        SimpleObjectProperty<Map<Field,String>> linkedIdentifiers = new SimpleObjectProperty<>(new HashMap<>());
-
-        entry.getField(StandardField.URL).ifPresent(value -> linkedIdentifiers.getValue().put(StandardField.URL, value));
-        entry.getField(StandardField.DOI).ifPresent(value -> linkedIdentifiers.getValue().put(StandardField.DOI, value));
-        entry.getField(StandardField.URI).ifPresent(value -> linkedIdentifiers.getValue().put(StandardField.URI, value));
-        entry.getField(StandardField.EPRINT).ifPresent(value -> linkedIdentifiers.getValue().put(StandardField.EPRINT, value));
-
-        return linkedIdentifiers;
+    public ObservableValue<Map<Field, String>> getLinkedIdentifiers() {
+        return Bindings.createObjectBinding(() -> {
+                    Map<Field, String> linkedIdentifiers = new HashMap<>();
+                    entry.getField(StandardField.URL).ifPresent(value -> linkedIdentifiers.put(StandardField.URL, value));
+                    entry.getField(StandardField.DOI).ifPresent(value -> linkedIdentifiers.put(StandardField.DOI, value));
+                    entry.getField(StandardField.URI).ifPresent(value -> linkedIdentifiers.put(StandardField.URI, value));
+                    entry.getField(StandardField.EPRINT).ifPresent(value -> linkedIdentifiers.put(StandardField.EPRINT, value));
+                    return linkedIdentifiers;
+                },
+                getEntry().getFieldBinding(StandardField.URL),
+                getEntry().getFieldBinding(StandardField.DOI),
+                getEntry().getFieldBinding(StandardField.URI),
+                getEntry().getFieldBinding(StandardField.EPRINT));
     }
 
     public ObservableValue<List<AbstractGroup>> getMatchedGroups(BibDatabaseContext database) {
-        SimpleObjectProperty<List<AbstractGroup>> matchedGroups = new SimpleObjectProperty<>(Collections.emptyList());
-
-        Optional<GroupTreeNode> root = database.getMetaData()
-                                               .getGroups();
+        Optional<GroupTreeNode> root = database.getMetaData().getGroups();
         if (root.isPresent()) {
-            List<AbstractGroup> groups = root.get().getMatchingGroups(entry)
-                                             .stream()
-                                             .map(GroupTreeNode::getGroup)
-                                             .collect(Collectors.toList());
-            groups.remove(root.get().getGroup());
-            matchedGroups.setValue(groups);
+            return EasyBind.map(entry.getFieldBinding(InternalField.GROUPS), field -> {
+                List<AbstractGroup> groups = root.get().getMatchingGroups(entry)
+                                                 .stream()
+                                                 .map(GroupTreeNode::getGroup)
+                                                 .collect(Collectors.toList());
+                groups.remove(root.get().getGroup());
+                return groups;
+            });
         }
-
-        return matchedGroups;
+        return new SimpleObjectProperty<>(Collections.emptyList());
     }
 }