diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js
index 7e69a608a4c025242cf01ed5c3939c734ace605a..99b7371fdb082abf26d282921aa28d3805343db3 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js
@@ -376,7 +376,7 @@ var LayoutManager = {
 	},
 	resize : function(view, forceFirstTime) {
 		if(this.canReload()) {
-			console.log("reloadView");
+			// console.log("reloadView");
 			this.reloadView(view, forceFirstTime);
 		}
 	}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
index 83fd0a6ef0496109cdcb69ffe3480e55ed520466..5586b42719771adc73a2cc1c366de9030ed41851 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
@@ -833,6 +833,8 @@ var FormUtil = new function() {
 			
 			var destroyAndRecreateFunc = destroyAndRecreate($component);
 			
+			mainController.currentView._windowHandlers.push(destroyAndRecreateFunc);
+			
 			destroyAndRecreateFunc();
 			
 			LayoutManager.addResizeEventHandler(destroyAndRecreateFunc);
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
index d64396c5753b9f427f1eade3a494f8c00a40ca39..b5baff49b98ecede782fcccdd8c7a948601262d6 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
@@ -18,6 +18,14 @@ function DataSetFormController(parentController, mode, entity, dataSet, isMini)
 	this._parentController = parentController;
 	this._dataSetFormModel = new DataSetFormModel(mode, entity, dataSet, isMini);
 	this._dataSetFormView = new DataSetFormView(this, this._dataSetFormModel);
+	this._windowHandlers = [];
+	
+	this.finalize = function() {
+		for(var whIdx = 0; whIdx < this._windowHandlers.length; whIdx++) {
+			$(window).off("resize", this._windowHandlers[whIdx]);
+		}
+		$("#mainContainer").css("overflow-y", "auto");
+	}
 	
 	this.init = function(views) {
 		var _this = this;