diff --git a/addon/components/pix-checkbox.hbs b/addon/components/pix-checkbox.hbs
index ff73d4cea..228572f3a 100644
--- a/addon/components/pix-checkbox.hbs
+++ b/addon/components/pix-checkbox.hbs
@@ -1,13 +1,4 @@
 <div class="pix-checkbox {{@class}}">
-  <input
-    type="checkbox"
-    id={{this.id}}
-    class={{this.inputClasses}}
-    checked={{@checked}}
-    aria-disabled={{@isDisabled}}
-    ...attributes
-  />
-
   <PixLabel
     @for={{this.id}}
     @requiredLabel={{@requiredLabel}}
@@ -15,7 +6,17 @@
     @inlineLabel={{true}}
     @screenReaderOnly={{@screenReaderOnly}}
     @isDisabled={{@isDisabled}}
+    @wrappedElement={{true}}
   >
+    <input
+      type="checkbox"
+      id={{this.id}}
+      class={{this.inputClasses}}
+      checked={{@checked}}
+      aria-disabled={{@isDisabled}}
+      ...attributes
+    />
+
     {{yield to="label"}}
   </PixLabel>
 </div>
\ No newline at end of file
diff --git a/addon/styles/_pix-checkbox.scss b/addon/styles/_pix-checkbox.scss
index 896b03d0f..ca4a24787 100644
--- a/addon/styles/_pix-checkbox.scss
+++ b/addon/styles/_pix-checkbox.scss
@@ -1,9 +1,6 @@
 .pix-checkbox {
   position: relative;
   z-index: 0;
-  display: flex;
-  gap: var(--pix-spacing-3x);
-  align-items: center;
 
   & + .pix-checkbox {
     margin-top: var(--pix-spacing-4x);