diff --git a/gui/webdisplay/inc/ROOT/RWebWindow.hxx b/gui/webdisplay/inc/ROOT/RWebWindow.hxx
index b15a6e2a9b6b490762f39b7b2462b5e9cb44d9d5..f8dea41c6891cc6196bbbc9fcbb4bac01e444956 100644
--- a/gui/webdisplay/inc/ROOT/RWebWindow.hxx
+++ b/gui/webdisplay/inc/ROOT/RWebWindow.hxx
@@ -178,7 +178,7 @@ public:
    /// Set content of default window HTML page
    /// This page returns when URL address of the window will be requested
    /// Either HTML code or file name in the form "file:/home/user/data/file.htm"
-   /// One also can use configure JSROOT location like "file:$jsrootsys/files/canvas.htm"
+   /// One also can using default locations like "file:rootui5sys/canv/canvas.html"
    void SetDefaultPage(const std::string &page) { fDefaultPage = page; }
 
    void SetPanelName(const std::string &name);
diff --git a/js/files/canvas.htm b/ui5/canv/canvas.html
similarity index 100%
rename from js/files/canvas.htm
rename to ui5/canv/canvas.html
diff --git a/ui5/canv/controller/Canvas.controller.js b/ui5/canv/controller/Canvas.controller.js
index 80971a23114064e21b0799c0f9b63764e26478cc..fd95f05afb1a2e8f3863a3bd4984ad427f2949be 100644
--- a/ui5/canv/controller/Canvas.controller.js
+++ b/ui5/canv/controller/Canvas.controller.js
@@ -49,6 +49,8 @@ sap.ui.define([
             
             cp.ShowUI5ProjectionArea = this.showProjectionArea.bind(this);
             cp.DrawInUI5ProjectionArea = this.drawInProjectionArea.bind(this);
+            
+            cp.ShowUI5Panel = this.showPanelInLeftArea.bind(this);
          }
 
          // this.toggleGedEditor();
@@ -303,7 +305,7 @@ sap.ui.define([
          this.showGeEditor(!this.isGedEditor());
       },
 
-      showPanelInLeftArea : function(panel_name, panel_handle, call_back) {
+      showPanelInLeftArea: function(panel_name, panel_handle, call_back) {
 
          var split = this.getView().byId("MainAreaSplitter");
          var curr = this.getView().getModel().getProperty("/LeftArea");
@@ -327,14 +329,10 @@ sap.ui.define([
 
          var panelid = "LeftPanelId";
 
-         var oModel = new JSONModel({
-            handle: panel_handle
-         });
-         sap.ui.getCore().setModel(oModel, panelid);
-
          XMLView.create({
             id: panelid,
-            viewName : "rootui5.canv.view." + panel_name,
+            viewName: "rootui5.canv.view." + panel_name,
+            viewData: { handle: panel_handle },
             layoutData: oLd,
             height: panel_name=="Panel" ? "100%" : undefined
          }).then(function(oView) {
@@ -344,7 +342,7 @@ sap.ui.define([
 
       },
 
-      showLeftArea : function(panel_name, call_back) {
+      showLeftArea: function(panel_name, call_back) {
          var split = this.getView().byId("MainAreaSplitter");
          var curr = this.getView().getModel().getProperty("/LeftArea");
          if (!split || (curr === panel_name)) return JSROOT.CallBack(call_back, null);