diff --git a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java
index 83a3efd6aa..179b971ce0 100644
--- a/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java
+++ b/app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java
@@ -19,10 +19,12 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
+import javafx.collections.FXCollections;
 import org.phoebus.applications.alarm.AlarmSystem;
 import org.phoebus.applications.alarm.client.AlarmClient;
 import org.phoebus.applications.alarm.client.AlarmClientLeaf;
@@ -529,6 +531,10 @@ private void performUpdates()
             items_to_update.clear();
         }
 
+        // Remember selection
+        final ObservableList<TreeItem<AlarmTreeItem<?>>> updatedSelectedItems = 
+                FXCollections.observableArrayList(tree_view.getSelectionModel().getSelectedItems());
+
         // How to update alarm tree cells when data changed?
         // `setValue()` with a truly new value (not 'equal') should suffice,
         // but there are two problems:
@@ -552,6 +558,10 @@ private void performUpdates()
                 // Create new TreeItem for that value
                 final AlarmTreeItem<?> value = view_item.getValue();
                 final TreeItem<AlarmTreeItem<?>> update = new TreeItem<>(value);
+                if (updatedSelectedItems.contains(view_item)) {
+                    updatedSelectedItems.remove(view_item);
+                    updatedSelectedItems.add(update);
+                }
                 // Move child links to new item
                 final ArrayList<TreeItem<AlarmTreeItem<?>>> children = new ArrayList<>(view_item.getChildren());
                 view_item.getChildren().clear();
@@ -561,6 +571,9 @@ private void performUpdates()
                 path2view.put(value.getPathName(), update);
                 parent.getChildren().set(index, update);
             }
+        // Restore selection
+        tree_view.getSelectionModel().clearSelection();
+        updatedSelectedItems.forEach(item -> tree_view.getSelectionModel().select(item));
     }
 
     /** Context menu, details depend on selected items */