diff --git a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/LogEntryEditorController.java b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/LogEntryEditorController.java
index a4ae21527c..e72d0f68fc 100644
--- a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/LogEntryEditorController.java
+++ b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/LogEntryEditorController.java
@@ -396,15 +396,11 @@ public void initialize() {
                 logbooksLabel.setTextFill(Color.BLACK);
         });
 
-        logbooksSelection.textProperty().bind(Bindings.createStringBinding(() -> {
-            if (selectedLogbooks.isEmpty()) {
-                return "";
-            }
-            StringBuilder stringBuilder = new StringBuilder();
-            selectedLogbooks.forEach(l -> stringBuilder.append(l).append(", "));
-            String text = stringBuilder.toString();
-            return text.substring(0, text.length() - 2);
-        }, selectedLogbooks));
+        logbooksSelection.textProperty().bind(Bindings.createStringBinding(() ->
+                selectedLogbooks.stream().collect(Collectors.joining(",")), selectedLogbooks));
+
+        tagsSelection.textProperty().bind(Bindings.createStringBinding(() ->
+                selectedTags.stream().collect(Collectors.joining(",")), selectedTags));
 
         logbooksDropdownButton.focusedProperty().addListener((changeListener, oldVal, newVal) ->
         {