diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/ExperimentDataGridUtil.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/ExperimentDataGridUtil.js
index ae53e20ad46ebe95172d3edf494d55d1bb71fe7a..dd48cfb523d48ae361709b1a6a7c5cedf7f11297 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/ExperimentDataGridUtil.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/ExperimentDataGridUtil.js
@@ -13,9 +13,7 @@ var ExperimentDataGridUtil = new function() {
 			isExportable: true,
 			sortable : true,
 			render : function(data) {
-				var href = Util.getURLFor(mainController.sideMenu.getCurrentNodeId(), "showExperimentPageFromIdentifier", data.identifier);
-				var link = $("<a>", { "href" : href, "class" : "browser-compatible-javascript-link" }).append(data.identifier);
-				return link;
+				return FormUtil.getFormLink(data.identifier, "Experiment", data.identifier);;
 			},
 			filter : function(data, filter) {
 				return data.identifier.toLowerCase().indexOf(filter) !== -1;
@@ -33,7 +31,10 @@ var ExperimentDataGridUtil = new function() {
 				label : 'Name',
 				property : 'NAME',
 				isExportable: true,
-				sortable : true
+				sortable : true,
+				render : function(data) {
+					return FormUtil.getFormLink(data.NAME, "Experiment", data.identifier);;
+				}
 			});
 		}
 		
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableController.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableController.js
index 20f9d5749ab6942a1ce05f4fc17420476712d26a..6314740e79c08f8e8ef2ca1aaa21fbe3d42d4b8e 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableController.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableController.js
@@ -71,9 +71,7 @@ function ExperimentTableController(parentController, title, project, showInProje
 			}
 			
 			//Click event
-			var rowClick = function(e) {
-				mainController.changeView('showExperimentPageFromIdentifier', e.data.identifier);
-			}
+			var rowClick = null;
 			
 			//Create and display table
 			var dataGridController = ExperimentDataGridUtil.getExperimentDataGrid(selectedTypeCode, experiments, rowClick);