diff --git a/javascripts/discourse/templates/components/body-row.hbs b/javascripts/discourse/templates/components/body-row.hbs
index 53659a5..3230f8c 100644
--- a/javascripts/discourse/templates/components/body-row.hbs
+++ b/javascripts/discourse/templates/components/body-row.hbs
@@ -1,5 +1,5 @@
 <div class="body-row">
-  <Input
+  <TextField
     @value={{bodyRowValue}}
     @class="table-builder-input"
     @placeholderKey={{theme-prefix "discourse_table_builder.modal.body"}}
@@ -17,4 +17,4 @@
     @action={{action "removeRow"}}
     @disabled={{this.disableRemoveRow}}
   />
-</div>
\ No newline at end of file
+</div>
diff --git a/javascripts/discourse/templates/components/header-column.hbs b/javascripts/discourse/templates/components/header-column.hbs
index ce51e3d..ee0a436 100644
--- a/javascripts/discourse/templates/components/header-column.hbs
+++ b/javascripts/discourse/templates/components/header-column.hbs
@@ -1,6 +1,6 @@
 <div class="header-column">
   <div class="header-row">
-    <Input
+    <TextField
       @value={{columnHeaderValue}}
       @class="table-builder-input"
       @id="header-column-{{@columnId}}"
@@ -59,4 +59,4 @@
       @title={{theme-prefix "discourse_table_builder.modal.buttons.add_column"}}
     />
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/javascripts/discourse/templates/modal/table-builder-modal.hbs b/javascripts/discourse/templates/modal/table-builder-modal.hbs
index a01024e..7ffc94f 100644
--- a/javascripts/discourse/templates/modal/table-builder-modal.hbs
+++ b/javascripts/discourse/templates/modal/table-builder-modal.hbs
@@ -37,4 +37,4 @@
     @label={{theme-prefix "discourse_table_builder.modal.cancel"}}
     @action={{action "cancelTableCreation"}}
   />
-</div>
\ No newline at end of file
+</div>