diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json
index b77fed2b..2e1822ad 100644
--- a/docs/src/COMPONENT_API.json
+++ b/docs/src/COMPONENT_API.json
@@ -8138,7 +8138,7 @@
         { "type": "forwarded", "name": "blur", "element": "input" }
       ],
       "typedefs": [],
-      "rest_props": { "type": "Element", "name": "div" }
+      "rest_props": { "type": "Element", "name": "input" }
     },
     {
       "moduleName": "TextInputSkeleton",
@@ -8359,7 +8359,7 @@
         { "type": "forwarded", "name": "blur", "element": "input" }
       ],
       "typedefs": [],
-      "rest_props": { "type": "Element", "name": "div" }
+      "rest_props": { "type": "Element", "name": "input" }
     },
     {
       "moduleName": "Tile",
diff --git a/src/TextInput/PasswordInput.svelte b/src/TextInput/PasswordInput.svelte
index f0ef0613..fa3abdf1 100644
--- a/src/TextInput/PasswordInput.svelte
+++ b/src/TextInput/PasswordInput.svelte
@@ -86,7 +86,6 @@
   class:bx--form-item="{true}"
   class:bx--text-input-wrapper="{true}"
   class:bx--password-input-wrapper="{!isFluid}"
-  {...$$restProps}
   on:click
   on:mouseover
   on:mouseenter
@@ -125,6 +124,7 @@
       class:bx--text-input--light="{light}"
       class:bx--text-input--invalid="{invalid}"
       class="{size && `bx--text-input--${size}`}"
+      {...$$restProps}
       on:change
       on:input
       on:input="{({ target }) => {
diff --git a/src/TextInput/TextInput.svelte b/src/TextInput/TextInput.svelte
index da0675bb..706c0096 100644
--- a/src/TextInput/TextInput.svelte
+++ b/src/TextInput/TextInput.svelte
@@ -77,7 +77,6 @@
   class:bx--form-item="{true}"
   class:bx--text-input-wrapper="{true}"
   class:bx--text-input-wrapper--inline="{inline}"
-  {...$$restProps}
   on:click
   on:mouseover
   on:mouseenter
@@ -156,6 +155,7 @@
         class:bx--text-input--invalid="{invalid}"
         class:bx--text-input--warn="{warn}"
         class="{size && `bx--text-input--${size}`}"
+        {...$$restProps}
         on:change
         on:input
         on:input="{({ target }) => {
diff --git a/types/TextInput/PasswordInput.d.ts b/types/TextInput/PasswordInput.d.ts
index 601d9d9c..9bc1f817 100644
--- a/types/TextInput/PasswordInput.d.ts
+++ b/types/TextInput/PasswordInput.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="svelte" />
 
-export interface PasswordInputProps extends svelte.JSX.HTMLAttributes<HTMLElementTagNameMap["div"]> {
+export interface PasswordInputProps extends svelte.JSX.HTMLAttributes<HTMLElementTagNameMap["input"]> {
   /**
    * Set the size of the input
    */
diff --git a/types/TextInput/TextInput.d.ts b/types/TextInput/TextInput.d.ts
index 1b56f537..1a3fadf3 100644
--- a/types/TextInput/TextInput.d.ts
+++ b/types/TextInput/TextInput.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="svelte" />
 
-export interface TextInputProps extends svelte.JSX.HTMLAttributes<HTMLElementTagNameMap["div"]> {
+export interface TextInputProps extends svelte.JSX.HTMLAttributes<HTMLElementTagNameMap["input"]> {
   /**
    * Set the size of the input
    */