diff --git a/components/insight/SRC/org/openmicroscopy/shoola/agents/dataBrowser/view/DataBrowserUI.java b/components/insight/SRC/org/openmicroscopy/shoola/agents/dataBrowser/view/DataBrowserUI.java
index 231e8c3e381..1bfd8b8b4fe 100644
--- a/components/insight/SRC/org/openmicroscopy/shoola/agents/dataBrowser/view/DataBrowserUI.java
+++ b/components/insight/SRC/org/openmicroscopy/shoola/agents/dataBrowser/view/DataBrowserUI.java
@@ -409,9 +409,10 @@ void setItemsPerRow(int number)
 	{
 		Browser browser = model.getBrowser();
 		Layout layout = browser.getSelectedLayout();
-		layout.setImagesPerRow(number);
-		//if (selectedView == THUMB_VIEW)
-		browser.accept(layout, ImageDisplayVisitor.IMAGE_SET_ONLY);
+		if (layout != null) {
+			layout.setImagesPerRow(number);
+			browser.accept(layout, ImageDisplayVisitor.IMAGE_SET_ONLY);
+		}
 	}
     
 	/**
diff --git a/components/insight/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewerComponent.java b/components/insight/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewerComponent.java
index aef91ed49d8..2ecfaf58c0e 100644
--- a/components/insight/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewerComponent.java
+++ b/components/insight/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewerComponent.java
@@ -122,6 +122,7 @@
 import pojos.ProjectData;
 import pojos.ScreenData;
 import pojos.TagAnnotationData;
+import pojos.WellData;
 import pojos.WellSampleData;
 
 /** 
@@ -1071,8 +1072,12 @@ public void setSelectedNode(Object object)
 		if (browser != null) last = browser.getLastSelectedDisplay();
 		if (last != null) exp = browser.getNodeOwner(last);
 		if (exp == null) exp = model.getUserDetails();
-		mv.setRootObject(selected, exp.getId());
+		if (selected instanceof WellSampleData) {
+			if (parent instanceof WellData)
+				parent = ((WellData) parent).getPlate();
+		}
 		mv.setParentRootObject(parent, null);
+		mv.setRootObject(selected, exp.getId());
 		if (size > 0) 
 			mv.setRelatedNodes(siblings);