diff --git a/src/app/components/overlay/overlay.ts b/src/app/components/overlay/overlay.ts
index 32eee0082b2..2d2e02a7b51 100644
--- a/src/app/components/overlay/overlay.ts
+++ b/src/app/components/overlay/overlay.ts
@@ -514,13 +514,18 @@ export class Overlay implements AfterContentInit, OnDestroy {
 
         switch (event.toState) {
             case 'visible':
-                this.show(container, true);
+                if (this.visible) {
+                    this.show(container, true);
+                }
                 this.bindListeners();
 
                 break;
 
             case 'void':
-                this.hide(container, true);
+                if (!this.visible) {
+                    this.hide(container, true);
+                }
+
                 this.unbindListeners();
 
                 DomHandler.appendOverlay(this.overlayEl, this.targetEl, this.appendTo);