diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
index 0ddf7a25aaf30e488882a6de6b45b2d86f59ea1e..22ec4285a8d77472b7a5715af6e92ac1683e42af 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
@@ -13,9 +13,7 @@ var SampleDataGridUtil = new function() {
 			isExportable: true,
 			sortable : true,
 			render : function(data) {
-				var href = Util.getURLFor(mainController.sideMenu.getCurrentNodeId(), "showViewSamplePageFromPermId", data.permId);
-				var link = $("<a>", { "href" : href, "class" : "browser-compatible-javascript-link" }).append(data.identifier);
-				return link;
+				return FormUtil.getFormLink(data.identifier, "Sample", data.permId);
 			},
 			filter : function(data, filter) {
 				return data.identifier.toLowerCase().indexOf(filter) !== -1;
@@ -33,7 +31,10 @@ var SampleDataGridUtil = new function() {
 				label : 'Name',
 				property : 'NAME',
 				isExportable: true,
-				sortable : true
+				sortable : true,
+				render : function(data) {
+					return FormUtil.getFormLink(data.NAME, "Sample", data.permId);
+				}
 			});
 		}
 		
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
index 6096c6738d232323c0e2f6f7454bfe52928450ab..1d4cbf4d885726b7de46b2153882575bbf718f01 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
@@ -82,13 +82,8 @@ function SampleTableController(parentController, title, experimentIdentifier, pr
 				}
 			}
 			
-			//Click event
-			var rowClick = function(e) {
-				mainController.changeView('showViewSamplePageFromPermId', e.data.permId);
-			}
-			
 			//Create and display table
-			var dataGridController = SampleDataGridUtil.getSampleDataGrid(selectedSampleTypeCode, samples, rowClick);
+			var dataGridController = SampleDataGridUtil.getSampleDataGrid(selectedSampleTypeCode, samples, null);
 			dataGridController.init(this._sampleTableView.getTableContainer());
 		}
 	}