diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/JupyterUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/JupyterUtil.js
index 81b9b77dee62022fa04cae5fbade8f023de15f55..975a89375cc089b085e380317e06fe788619a6a7 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/JupyterUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/JupyterUtil.js
@@ -19,7 +19,7 @@ var JupyterUtil = new function() {
 	this.getJupyterURL = function(path) {
 	    var url = profile.jupyterEndpoint + "hub/login?token=" + mainController.serverFacade.getSession();
 	    if(path) {
-	        url = url + "&next=" + path;
+	        url = url + "&next=" + encodeURIComponent(path);
 	    }
 	    return url;
 	}
@@ -32,7 +32,7 @@ var JupyterUtil = new function() {
 	this.openJupyterNotebookFromTemplate = function(folder, fileName, template, dataSetId, keepHistory) {
 		fileName = fileName + ".ipynb";
 		var jupyterURL = profile.jupyterIntegrationServerEndpoint + "?token=" + mainController.serverFacade.openbisServer.getSession() + "&folder=" + folder + "&filename=" + fileName;
-		var jupyterNotebookURL = JupyterUtil.getJupyterURL("/user/" + mainController.serverFacade.getUserId() + "/notebooks/" + folder + "/");
+		var jupyterNotebookURL = JupyterUtil.getJupyterURL("/user/" + mainController.serverFacade.getUserId() + "/notebooks/" + folder + "/" + fileName);
 		
 		$.ajax({
             url : jupyterURL + "&test=True",
@@ -67,7 +67,7 @@ var JupyterUtil = new function() {
                     crossDomain: true,
                     data : JSON.stringify(jupyterNotebookJson),
                     success : function(result) {
-                    	var win = window.open(jupyterNotebookURL + result.fileName, '_blank');
+                    	var win = window.open(jupyterNotebookURL, '_blank');
         				win.focus(); 
                     },
                     error : function(result) {
@@ -94,7 +94,7 @@ var JupyterUtil = new function() {
             success : function(result) {
             	var fileName = result.fileName
             	var newJupyterNotebook = _this.createJupyterNotebookContent(dataSets, ownerEntity, fileName);
-        		var jupyterNotebookURL = JupyterUtil.getJupyterURL("/user/" + mainController.serverFacade.getUserId() + "/notebooks/" + folder + "/");
+        		var jupyterNotebookURL = JupyterUtil.getJupyterURL("/user/" + mainController.serverFacade.getUserId() + "/notebooks/" + folder + "/" + fileName);
         		
         		$.ajax({
                     url : jupyterURL + "&test=False",
@@ -102,7 +102,7 @@ var JupyterUtil = new function() {
                     crossDomain: true,
                     data : JSON.stringify(newJupyterNotebook),
                     success : function(result) {
-                    	var win = window.open(jupyterNotebookURL + result.fileName, '_blank');
+                    	var win = window.open(jupyterNotebookURL, '_blank');
         				win.focus(); 
                     },
                     error : function(result) {