diff --git a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
index ad810e99..4c2b3e7b 100644
--- a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
@@ -217,7 +217,7 @@ class MainFrameView {
                                         scrollPane(constraints : BorderLayout.CENTER) {
                                             def jtree = new JTree(model.sharedTree)
                                             jtree.setCellRenderer(new SharedTreeRenderer())
-                                            tree(id : "shared-files-tree", rootVisible : false, jtree)
+                                            tree(id : "shared-files-tree", rootVisible : false, expandsSelectedPaths: true, jtree)
                                         }
                                     }
                                 }
@@ -876,7 +876,10 @@ class MainFrameView {
     }
     
     public void refreshSharedFiles() {
+        def tree = builder.getVariable("shared-files-tree")
+        TreePath[] selectedPaths = tree.getSelectionPaths()
         model.sharedTree.nodeStructureChanged(model.treeRoot)
+        tree.setSelectionPaths(selectedPaths)
         builder.getVariable("shared-files-table").model.fireTableDataChanged()
     }
 }
\ No newline at end of file