Index: web/src/main/java/com/xpn/xwiki/watch/client/Watch.java
===================================================================
--- web/src/main/java/com/xpn/xwiki/watch/client/Watch.java	(revision 5531)
+++ web/src/main/java/com/xpn/xwiki/watch/client/Watch.java	(working copy)
@@ -250,6 +250,8 @@
      */
     public void refreshArticleList() {
         userInterface.refreshData("articlelist");
+        //refresh article number which will refresh the feedtree as well.
+        config.refreshArticleNumber();
         newArticlesMonitoring.stopBlinking();
     }
 
Index: web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/FeedTreeWidget.java
===================================================================
--- web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/FeedTreeWidget.java	(revision 5531)
+++ web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/FeedTreeWidget.java	(working copy)
@@ -85,6 +85,12 @@
     }
 
     private void  makeFeedTree() {
+        //get the state of the tree items on first level -> the groups tree items
+        HashMap itemsState = new HashMap();
+        for (int i = 0; i < this.groupTree.getItemCount(); i++) {
+            TreeItem currentTreeItem = this.groupTree.getItem(i);
+            itemsState.put(currentTreeItem.getUserObject(), new Boolean(currentTreeItem.getState()));
+        }
         // clear all trees
         groupTree.clear();
 
@@ -103,6 +109,8 @@
             if ((groupname!=null)&&(!groupname.trim().equals(""))) {
                 Map group = (Map) feedsbygroup.get(groupname);
                 TreeItem groupItemTree = new TreeItem();
+                //set a key to the tree item, to test its state afterwards
+                groupItemTree.setUserObject(groupname);
                 Hyperlink link = new Hyperlink(groupTitle, "");
                 link.setStyleName(watch.getStyleName("feedtree","link"));
                 link.addClickListener(new ClickListener() {
@@ -120,6 +128,11 @@
                     Feed feed = (Feed) group.get(feedname);
                     addFeedToTree(groupItemTree, feed);
                 }
+                //expand it if necessary
+                Boolean state = (Boolean)itemsState.get(groupname);
+                if (state != null) {
+                    groupItemTree.setState(state.booleanValue());
+                }
                 groupTree.addItem(groupItemTree);
             }
         }
