diff --git a/app/display/navigator/src/main/java/org/phoebus/applications/display/navigator/NavigatorController.java b/app/display/navigator/src/main/java/org/phoebus/applications/display/navigator/NavigatorController.java
index c5de6fa49f..2771c9bb54 100644
--- a/app/display/navigator/src/main/java/org/phoebus/applications/display/navigator/NavigatorController.java
+++ b/app/display/navigator/src/main/java/org/phoebus/applications/display/navigator/NavigatorController.java
@@ -1124,28 +1124,27 @@ protected class NavigationTree_TreeCellClass extends TreeCell<NavigatorTreeNode>
                     });
                     contextMenu.getItems().add(menuItem_createNewFolder);
                 }
-            }
-
 
-            {
-                if (getTreeItem() != null && getTreeItem().getValue() != null && getTreeItem().getValue().getNodeType() == NavigatorTreeNode.NodeType.VirtualFolder) {
-                    Runnable renameFolder = () -> promptForTextInput(Messages.RenameFolderPrompt,
-                            getTreeItem().getValue().getLabel(),
-                            newName -> {
-                                if (!getTreeItem().getValue().getLabel().equals(newName)) {
-                                    setUnsavedChanges(true);
-                                    getTreeItem().getValue().setLabel(newName);
-                                    treeView.refresh();
-                                }
-                            });
+                {
+                    if (getTreeItem() != null && getTreeItem().getValue() != null && getTreeItem().getValue().getNodeType() == NavigatorTreeNode.NodeType.VirtualFolder) {
+                        Runnable renameFolder = () -> promptForTextInput(Messages.RenameFolderPrompt,
+                                getTreeItem().getValue().getLabel(),
+                                newName -> {
+                                    if (!getTreeItem().getValue().getLabel().equals(newName)) {
+                                        setUnsavedChanges(true);
+                                        getTreeItem().getValue().setLabel(newName);
+                                        treeView.refresh();
+                                    }
+                                });
 
-                    MenuItem menuItem_renameFolder = new MenuItem(Messages.RenameFolder);
+                        MenuItem menuItem_renameFolder = new MenuItem(Messages.RenameFolder);
 
-                    menuItem_renameFolder.setOnAction(actionEvent -> {
-                        renameFolder.run();
-                    });
+                        menuItem_renameFolder.setOnAction(actionEvent -> {
+                            renameFolder.run();
+                        });
 
-                    contextMenu.getItems().add(menuItem_renameFolder);
+                        contextMenu.getItems().add(menuItem_renameFolder);
+                    }
                 }
             }
         };