From 7eb405d3e50ef1ab94b3e8528ae2ab13a1623157 Mon Sep 17 00:00:00 2001
From: mertsincan <sincan.mert@gmail.com>
Date: Thu, 20 Jul 2023 11:01:18 +0100
Subject: [PATCH] Fixed #4167

---
 components/lib/overlaypanel/OverlayPanel.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/lib/overlaypanel/OverlayPanel.vue b/components/lib/overlaypanel/OverlayPanel.vue
index 24246b7c4f..cd8ff63e13 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) {