diff --git a/ChartsSpace/TimeMachine.js b/ChartsSpace/TimeMachine.js
index a44a3c01a..87571461a 100644
--- a/ChartsSpace/TimeMachine.js
+++ b/ChartsSpace/TimeMachine.js
@@ -392,11 +392,11 @@ function newTimeMachine () {
 
   function panelPhysics () {
     if (thisObject.container.frame.isInViewPort() && canvas.chartSpace.viewport.zoomTargetLevel > ZOOM_OUT_THRESHOLD_FOR_HIDDING_PANELS) {
-      canvas.panelsSpace.makeVisible(thisObject.payload.node.id, 'Layers Panel')
-      canvas.panelsSpace.makeVisible(thisObject.payload.node.id, 'Plotter Panel')
+      canvas.panelsSpace.unHide(thisObject.payload.node.id, 'Layers Panel')
+      canvas.panelsSpace.unHide(thisObject.payload.node.id, 'Plotter Panel')
     } else {
-      canvas.panelsSpace.makeInvisible(thisObject.payload.node.id, 'Layers Panel')
-      canvas.panelsSpace.makeInvisible(thisObject.payload.node.id, 'Plotter Panel')
+      canvas.panelsSpace.hide(thisObject.payload.node.id, 'Layers Panel')
+      canvas.panelsSpace.hide(thisObject.payload.node.id, 'Plotter Panel')
     }
   }
 
diff --git a/Spaces/PanelsSpace.js b/Spaces/PanelsSpace.js
index e52819191..efe7e03b9 100644
--- a/Spaces/PanelsSpace.js
+++ b/Spaces/PanelsSpace.js
@@ -8,8 +8,8 @@ function newPanelsSpace () {
   let thisObject = {
     visible: true,
     container: undefined,
-    makeVisible: makeVisible,
-    makeInvisible: makeInvisible,
+    unHide: unHide,
+    hide: hide,
     createNewPanel: createNewPanel,
     destroyPanel: destroyPanel,
     getPanel: getPanel,
@@ -76,20 +76,20 @@ function newPanelsSpace () {
     return panel.handle
   }
 
-  function makeVisible (owner, type) {
+  function unHide (owner, type) {
     for (let i = 0; i < thisObject.panels.length; i++) {
       let panel = thisObject.panels[i]
       if (panel.owner === owner && panel.type === type) {
-        panel.isVisible = true
+        panel.isHidden = false
       }
     }
   }
 
-  function makeInvisible (owner, type) {
+  function hide (owner, type) {
     for (let i = 0; i < thisObject.panels.length; i++) {
       let panel = thisObject.panels[i]
       if (panel.owner === owner && panel.type === type) {
-        panel.isVisible = false
+        panel.isHidden = true
       }
     }
   }
@@ -144,7 +144,7 @@ function newPanelsSpace () {
     if (thisObject.panels !== undefined) {
       for (let i = 0; i < thisObject.panels.length; i++) {
         let panel = thisObject.panels[i]
-        if (panel.isVisible === false) { continue }
+        if (panel.isVisible === false || panel.isHidden === true) { continue }
         /* setting the speed of the panel */
         if (panel.container.speed === undefined) {
           panel.container.speed = {
@@ -246,7 +246,7 @@ function newPanelsSpace () {
 
       for (let i = 0; i < currentIndex; i++) {
         let panel = thisObject.panels[i]
-        if (panel.isVisible === true) {
+        if (panel.isVisible === true && panel.isHidden === false) {
           if (isThisPointInsideThisFrame(corner1, panel.container.frame) === true) {
             pushOut(currentContainer, panel.container, panel.gravitatesTowards)
           }
@@ -319,7 +319,7 @@ function newPanelsSpace () {
       let panel = thisObject.panels[i]
       let owner = canvas.chartSpace.inViewport.get(panel.owner)
       if (owner !== undefined) {
-        if (panel.isVisible === true) {
+        if (panel.isVisible === true && panel.isHidden === false) {
           panel.draw()
         }
       }
@@ -338,7 +338,7 @@ function newPanelsSpace () {
       let panel = thisObject.panels[i]
       let owner = canvas.chartSpace.inViewport.get(panel.owner)
       if (owner !== undefined) {
-        if (panel.isVisible === true) {
+        if (panel.isVisible === true && panel.isHidden === false) {
           container = panel.getContainer(point)
         }
       }