diff --git a/components/lib/overlaypanel/OverlayPanel.vue b/components/lib/overlaypanel/OverlayPanel.vue
index 24246b7c4..cd8ff63e1 100755
--- a/components/lib/overlaypanel/OverlayPanel.vue
+++ b/components/lib/overlaypanel/OverlayPanel.vue
@@ -97,7 +97,6 @@ export default {
         },
         hide() {
             this.visible = false;
-            DomHandler.focus(this.target);
         },
         onContentClick() {
             this.selfClick = true;
@@ -160,7 +159,10 @@ export default {
             }
         },
         onContentKeydown(event) {
-            event.code === 'Escape' && this.hide();
+            if (event.code === 'Escape') {
+                this.hide();
+                DomHandler.focus(this.target);
+            }
         },
         onButtonKeydown(event) {
             switch (event.code) {