diff --git a/@codexteam/ui/src/vue/components/popup/Popup.vue b/@codexteam/ui/src/vue/components/popup/Popup.vue
index 22dbb5c3..2cb38604 100644
--- a/@codexteam/ui/src/vue/components/popup/Popup.vue
+++ b/@codexteam/ui/src/vue/components/popup/Popup.vue
@@ -88,6 +88,7 @@ withDefaults(
     border-radius: var(--radius-l);
     margin-left: var(--spacing-l);
     margin-top: var(--spacing-xs);
+    box-sizing: content-box;
 
     &:hover {
       color: var(--base--text);
diff --git a/@codexteam/ui/src/vue/components/switch/Switch.vue b/@codexteam/ui/src/vue/components/switch/Switch.vue
index 2a1ec824..8ac3d805 100644
--- a/@codexteam/ui/src/vue/components/switch/Switch.vue
+++ b/@codexteam/ui/src/vue/components/switch/Switch.vue
@@ -47,6 +47,7 @@ function changeValue() {
   border-radius: var(--radius-l);
   background-color: var(--bg-color);
   transition: background-color 0.2s;
+  box-sizing: content-box;
 
   &:not(&--disabled):hover {
     --bg-color: var(--accent--bg-secondary-hover);