diff --git a/packages/materialdesign-components/src/DatePicker/DatePicker.svelte b/packages/materialdesign-components/src/DatePicker/DatePicker.svelte
index bfc250ede..f9db97a10 100644
--- a/packages/materialdesign-components/src/DatePicker/DatePicker.svelte
+++ b/packages/materialdesign-components/src/DatePicker/DatePicker.svelte
@@ -98,6 +98,7 @@
 
 <div class="mdc-menu-surface--anchor">
   <Textfield
+    {_bb}
     {label}
     onChange={dateFieldChange}
     value={selectedDate}
diff --git a/packages/materialdesign-components/src/Textfield/Textfield.svelte b/packages/materialdesign-components/src/Textfield/Textfield.svelte
index ace20dbf3..046c3ebc6 100644
--- a/packages/materialdesign-components/src/Textfield/Textfield.svelte
+++ b/packages/materialdesign-components/src/Textfield/Textfield.svelte
@@ -129,6 +129,7 @@ TODO:Needs error handling - this will depend on how Budibase handles errors
       {#if renderLeadingIcon}
         {#if useIconButton}
           <IconButton
+            {_bb}
             {icon}
             context="mdc-text-field__icon mdc-text-field__icon--leading"
             onClick={iconButtonClick} />
@@ -152,6 +153,7 @@ TODO:Needs error handling - this will depend on how Budibase handles errors
       {#if renderTrailingIcon}
         {#if useIconButton}
           <IconButton
+            {_bb}
             {icon}
             context="mdc-text-field__icon mdc-text-field__icon--trailing"
             onClick={iconButtonClick} />