diff --git a/CHANGELOG.md b/CHANGELOG.md
index e976bf93ed0..862bb7770dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,7 +29,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 - The tab "deprecated fields" is shown in biblatex-mode only. [#7757](https://github.com/JabRef/jabref/issues/7757)
 - We fixed an issue where the last opened libraries were not remembered when a new unsaved libray was open as well [#9190](https://github.com/JabRef/jabref/issues/9190)
-
+- We fixed an issue where no context menu for the group "All entries" was present [forum#3682](https://discourse.jabref.org/t/how-sort-groups-a-z-not-subgroups/3682)
 
 ### Removed
 
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
index dabccd9204b..27225aa42ac 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -447,7 +447,7 @@ private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) {
             menu.getItems().clear();
             if (viewModel.isEditable(group)) {
                 menu.getItems().add(editGroup);
-                if (group.getChildren().size() > 0 && viewModel.canAddGroupsIn(group)) {
+                if ((group.getChildren().size() > 0) && viewModel.canAddGroupsIn(group)) {
                     menu.getItems().add(removeGroupWithSubgroups);
                     menu.getItems().add(new SeparatorMenuItem());
                     menu.getItems().add(addSubgroup);
@@ -461,6 +461,11 @@ private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) {
                     }
                 }
             }
+            if (group.isRoot()) {
+                menu.getItems().add(addSubgroup);
+                menu.getItems().add(removeSubgroups);
+                menu.getItems().add(sortSubgroups);
+            }
 
             if (viewModel.canAddEntriesIn(group)) {
                 menu.getItems().add(new SeparatorMenuItem());