diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js
index 708aae24e2622a18241bb1974820bc7761ee46bd..dd9a8ee470144c5fb9fec9dc8781cbf8560e6d78 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js
@@ -34,6 +34,11 @@ $.extend(DefaultProfile.prototype, {
 		this.ELNExperiments = ["SYSTEM_EXPERIMENT"];
 		this.notShowTypes = ["SYSTEM_EXPERIMENT"];
 		this.inventorySpaces = [];
+		
+		this.isInventorySpace = function(spaceCode) {
+			return ($.inArray(spaceCode, this.inventorySpaces) !== -1);
+		}
+		
 		this.hideCodes = false;
 		this.propertyReplacingCode = "NAME";
 		
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/ExperimentForm/ExperimentFormController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/ExperimentForm/ExperimentFormController.js
index 41df73fd77f8cb4422af52cd5eb1378495e28d39..dfd45f1a7191c31b731cd987c54413ea526137a8 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/ExperimentForm/ExperimentFormController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/ExperimentForm/ExperimentFormController.js
@@ -82,7 +82,8 @@ function ExperimentFormController(mainController, mode, experiment) {
 					var callbackOk = function() {
 						var projectIdentifier = "/" + experimentSpace + "/" + experimentProject;
 						if(_this._experimentFormModel.mode === FormMode.CREATE) {
-							_this._mainController.sideMenu.refreshExperiment(experiment);
+							var isInventory = profile.isInventorySpace(experimentSpace);
+							_this._mainController.sideMenu.refreshExperiment(experiment, isInventory);
 						}
 						_this._experimentFormModel.isFormDirty = false;
 						_this._mainController.changeView("showExperimentPageFromIdentifier", experimentIdentifier);
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js
index cb1b1fc9c7d8b9165c5cbf32bc633f4d2714fb98..05bff72387b22202288905f747bd427d4c3667ab 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js
@@ -189,6 +189,10 @@ function SampleTable(serverFacade, sampleTableId, profile, sampleTypeCode, inspe
 				component += "<h1>Search Results</h1>";
 			} else {
 				var sampleType = this.profile.getSampleTypeForSampleTypeCode(this.sampleTypeCode);
+				if(!sampleType) {
+					$("#"+this.sampleTableId).append("<h1>No Samples Found</h1>");
+					return;
+				}
 				var sampleTypeDisplayName = Util.getEmptyIfNull(sampleType.description);
 				if(sampleTypeDisplayName === "") {
 					sampleTypeDisplayName = sampleType.code;
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js
index 0ec85de4a03ade90cc1cffa6cdead6f07e1bbb33..07a302f31d1ccfdd8e7c3c5e2c6e144c91855339 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js
@@ -45,7 +45,7 @@ function SideMenuWidget(mainController, containerId, serverFacade) {
 		this.repaint();
 	}
 	
-	this.refreshExperiment = function(experiment) {
+	this.refreshExperiment = function(experiment, isInventory) {
 		var projectNode = this._getProjectNodeForCode(experiment.identifier.split("/")[2]);
 		var newMenuIfSelectedExperiment = {
 				children : []
@@ -59,7 +59,13 @@ function SideMenuWidget(mainController, containerId, serverFacade) {
 			displayName = experiment.code;
 		}
 		
-		var menuItemExperiment = new SideMenuWidgetComponent(true, false, displayName, experiment.code, projectNode, newMenuIfSelectedExperiment, "showExperimentPageFromIdentifier", experiment.identifier, "(Experiment)");
+		var menuItemExperiment = null;
+		if(isInventory) {
+			menuItemExperiment = new SideMenuWidgetComponent(true, false, displayName, experiment.code, projectNode, null, "showSamplesPage", experiment.identifier + ":None");
+		} else {
+			menuItemExperiment = new SideMenuWidgetComponent(true, false, displayName, experiment.code, projectNode, newMenuIfSelectedExperiment, "showExperimentPageFromIdentifier", experiment.identifier, "(Experiment)");
+		}
+		
 		projectNode.newMenuIfSelected.children.push(menuItemExperiment);
 		
 		this.repaint();
@@ -287,7 +293,7 @@ function SideMenuWidget(mainController, containerId, serverFacade) {
 									displayName = experiment.code;
 								}
 								
-								var menuItemExperiment = new 	SideMenuWidgetComponent(true, false, displayName, experiment.code, projectNode, null, "showSamplesPage", experiment.identifier + ":" + experiment.permId /* "PROTEIN" */, "");
+								var menuItemExperiment = new SideMenuWidgetComponent(true, false, displayName, experiment.code, projectNode, null, "showSamplesPage", experiment.identifier + ":" + experiment.permId /* "PROTEIN" */, "");
 								projectNode.newMenuIfSelected.children.push(menuItemExperiment);
 							}
 						}