diff --git a/src/mixins/popup/index.js b/src/mixins/popup/index.js
index c2c97d40b..a0182e133 100644
--- a/src/mixins/popup/index.js
+++ b/src/mixins/popup/index.js
@@ -99,9 +99,12 @@ export function PopupMixin(options = {}) {
     },
 
     beforeDestroy() {
-      this.removeLock();
       removeOverlay(this);
 
+      if (this.opened) {
+        this.removeLock();
+      }
+
       if (this.getContainer) {
         removeNode(this.$el);
       }