diff --git a/src/components/input/NumberInput.tsx b/src/components/input/NumberInput.tsx
index 1b5559ed..4d6a7393 100644
--- a/src/components/input/NumberInput.tsx
+++ b/src/components/input/NumberInput.tsx
@@ -397,20 +397,24 @@ const NumberInput = ({
{/* Prefix Block */}
{inputPrefix && (
-
-
+ )}
+ >
+
{inputPrefix}
@@ -419,7 +423,7 @@ const NumberInput = ({
{/* Input Wrapper */}
-
+ )}
+ >
+
{inputSuffix}
diff --git a/src/components/input/TextArea.tsx b/src/components/input/TextArea.tsx
index 802e469c..34644021 100644
--- a/src/components/input/TextArea.tsx
+++ b/src/components/input/TextArea.tsx
@@ -87,7 +87,7 @@ const TextArea = ({