diff --git a/packages/ui/src/components/PanelInstance.svelte b/packages/ui/src/components/PanelInstance.svelte index c6b8913806..b38c4d321e 100644 --- a/packages/ui/src/components/PanelInstance.svelte +++ b/packages/ui/src/components/PanelInstance.svelte @@ -18,6 +18,7 @@ import { afterUpdate } from 'svelte' import { Spinner } from '..' import { closePanel, PanelProps, panelstore as modal } from '../panelup' + import { popupstore } from '../popups' let modalHTML: HTMLElement let componentInstance: any @@ -31,6 +32,11 @@ $: props = $modal.panel function escapeClose () { + // Check if there is popup visible, then ignore + if ($popupstore.length > 0) { + return + } + if (componentInstance && componentInstance.canClose) { if (!componentInstance.canClose()) return }