diff --git a/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java b/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java
index 5f4af5c050..bd47d6b792 100644
--- a/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java
+++ b/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java
@@ -108,6 +108,7 @@ public void initialize() {
         snapshotProperty.addListener((ob, o, n) -> {
             if (n != null) {
                 snapshotControlsViewController.setSnapshotNode(n.getSnapshotNode());
+                snapshotTableViewController.showSnapshotInTable(n);
             }
         });
     }
@@ -150,6 +151,7 @@ public void takeSnapshot() {
             disabledUi.set(false);
             if (snapshot.isPresent()) {
                 snapshotProperty.set(snapshot.get());
+                snapshotTableViewController.showSnapshotInTable(snapshot.get());
             }
         });
     }
@@ -336,7 +338,7 @@ private void loadSnapshotInternal(Node snapshotNode) {
                 Snapshot snapshot = getSnapshotFromService(snapshotNode);
                 snapshotProperty.set(snapshot);
                 Platform.runLater(() -> {
-                    snapshotTableViewController.showSnapshotInTable(snapshot);
+                    //snapshotTableViewController.showSnapshotInTable(snapshot);
                     snapshotControlsViewController.getSnapshotRestorableProperty().set(true);
                 });
             } finally {