diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61889d6..3ec78a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed tooltip icon and onclick event issues in <FormGroupLayoutLabel/> component.
+
 ## [2.13.1] - 2024-12-02
 
 ### Fixed
diff --git a/src/lib/FormGroupLayoutLabel.tsx b/src/lib/FormGroupLayoutLabel.tsx
index f0d795d..4977a4f 100644
--- a/src/lib/FormGroupLayoutLabel.tsx
+++ b/src/lib/FormGroupLayoutLabel.tsx
@@ -31,7 +31,7 @@ const FormGroupLayoutLabel = <T extends FieldValues>(props: FormGroupLayoutLabel
 
   return (
     <>
-      <Label check={checkboxLayout || switchLayout} for={fieldId}>
+      <Label check={checkboxLayout || switchLayout} for={fieldId} onClick={(e) => e.stopPropagation()}>
         {finalLabel}
         {tooltip && (
           <svg
@@ -42,7 +42,10 @@ const FormGroupLayoutLabel = <T extends FieldValues>(props: FormGroupLayoutLabel
             stroke="currentColor"
             id={`Tooltip-${fieldId}`}
             className="tooltip--icon"
-          >
+            width="24"
+            height="24"
+            onClick={(e) => e.preventDefault()}
+         >
             <path
               strokeLinecap="round"
               strokeLinejoin="round"