diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
index 27459254beb43da8698047b41287d6d0eb3031ce..52682e37221df25d78b0fcc18dd88d099b293de6 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
@@ -287,6 +287,7 @@ var SampleDataGridUtil = new function() {
 					objects : dataList,
 					totalCount : result.totalCount
 				});
+				Util.unblockUI();
 			}
 			
 			var fetchOptions = {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
index e45bd9224133d395513d71f67213eebde6361d86..c2c370550716181d273960afcdd9b993caafdb36 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
@@ -25,7 +25,7 @@ function SampleTableController(parentController, title, experimentIdentifier, pr
 		
 		var callback = function() {
 			_this._sampleTableView.repaint($container);
-			Util.unblockUI();
+			//Util.unblockUI();
 		};
 		
 		if(this._sampleTableModel.experimentIdentifier || projectPermId) {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js
index 320636db652bf6507d10c63a45df61e757f7d0b2..093996651b0a88f4a398cb367f8af03598c7a985 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js
@@ -11,6 +11,8 @@ $.extend(Grid.prototype, {
 		this.getDataList = getDataList;
 		this.showAllColumns = showAllColumns;
 		this.tableSettings = tableSettings;
+		this.firstLoad = true;
+		
 		if(!this.tableSettings) {
 			this.tableSettings = {
 					columns : null,
@@ -566,6 +568,11 @@ $.extend(Grid.prototype, {
 	list : function(options, callback) {
 		var thisGrid = this;
 		
+		if(thisGrid.firstLoad) {
+			$(thisGrid.panel).hide();
+			thisGrid.firstLoad = false;
+		}
+		
 		thisGrid.getDataList(function(dataListResult) {
 			dataList = null;
 			var isDynamic = (dataListResult.totalCount != null && dataListResult.totalCount != undefined);
@@ -676,7 +683,7 @@ $.extend(Grid.prototype, {
 				
 				//HACK:	Legacy Hacks no longer needed
 				$(window).trigger('resize'); // HACK: Fixes table rendering issues when refreshing the grid on fuelux 3.1.0 for all browsers
-				$(thisGrid.panel).hide().show(0); // HACK: Fixes Chrome rendering issues when refreshing the grid on fuelux 3.1.0
+				$(thisGrid.panel).show(0); // HACK: Fixes Chrome rendering issues when refreshing the grid on fuelux 3.1.0
 				
 				// HACK: Fix that only works if there is only one table at a time (dont works Safari)
 //				var newWidth = $(".repeater-list-wrapper > .table").width();