diff --git a/packages/core/src/components/cv-ui-shell/cv-header-panel.vue b/packages/core/src/components/cv-ui-shell/cv-header-panel.vue
index 9c01e59c0..4097aa774 100644
--- a/packages/core/src/components/cv-ui-shell/cv-header-panel.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-header-panel.vue
@@ -62,7 +62,7 @@ export default {
       this.$parent.$emit('cv:panel-focusout', this, ev);
     },
     onMouseDown(ev) {
-      if (this.$el === ev.target) {
+      if (this.$el == ev.target || this.$el.contains(ev.target)) {
         // ignore mousedown on panel can cause focus event
         ev.preventDefault();
       }
diff --git a/packages/core/src/components/cv-ui-shell/cv-side-nav.vue b/packages/core/src/components/cv-ui-shell/cv-side-nav.vue
index f23655863..5b2a8c27e 100644
--- a/packages/core/src/components/cv-ui-shell/cv-side-nav.vue
+++ b/packages/core/src/components/cv-ui-shell/cv-side-nav.vue
@@ -80,7 +80,7 @@ export default {
       this.$parent.$emit('cv:panel-focusout', this, ev);
     },
     onMouseDown(ev) {
-      if (this.$el === ev.target) {
+      if (this.$el == ev.target || this.$el.contains(ev.target)) {
         // ignore mousedown on panel can cause focus event
         ev.preventDefault();
       }