diff --git a/views/actions/action_bar/5.publish2.tmpl b/views/actions/action_bar/5.publish2.tmpl
index d7e974e..f3a939c 100644
--- a/views/actions/action_bar/5.publish2.tmpl
+++ b/views/actions/action_bar/5.publish2.tmpl
@@ -41,11 +41,11 @@
       <label class="qor-field__label">{{t "qor_publish.action_bar.time_travel" "Time Travel"}}</label>
       <input class="qor-datetimepicker__input qor-filter__scheduled-time" placeholder="YYYY-MM-DD" data-search-param="publish_scheduled_time" type="text" value="{{get_publish_schedule_time .}}" />
       <div class="qor-field__datetimepicker-button">
-        <button data-toggle="qor.datepicker" data-target-input=".qor-datetimepicker__input" class="qor-action__datepicker" type="button">
+        <button data-toggle="qor.datepicker" class="qor-action__datepicker" type="button">
           <i class="material-icons">date_range</i>
         </button>
 
-        <button data-toggle="qor.timepicker" data-target-input=".qor-datetimepicker__input" class="qor-action__timepicker" type="button">
+        <button data-toggle="qor.timepicker" class="qor-action__timepicker" type="button">
           <i class="material-icons">access_time</i>
         </button>
       </div>
diff --git a/views/themes/publish2/actions/9.publish2.tmpl b/views/themes/publish2/actions/9.publish2.tmpl
index c86bab2..70d563c 100644
--- a/views/themes/publish2/actions/9.publish2.tmpl
+++ b/views/themes/publish2/actions/9.publish2.tmpl
@@ -74,11 +74,11 @@
           <div class="qor-field__edit qor-field__datetimepicker" data-picker-type="datetime">
             <input class="mdl-textfield__input qor-datetimepicker__input qor-pulish2__action-input qor-pulish2__action-start" data-start-date="true" data-action-type="scheduledstart" placeholder="{{meta_placeholder $scheduledStartAtMeta $context "YYYY-MM-DD HH:MM"}}" type="text" value="{{render_meta $result $scheduledStartAtMeta}}" {{if $scheduleEventIDMeta}}{{if $scheduleEvent.ID}}disabled{{end}}{{else if not (has_update_permission $scheduledStartAtMeta)}}disabled{{end}}>
             <div class="qor-action__picker-button" {{if $scheduleEventIDMeta}}{{if $scheduleEvent.ID}}style="display:none"{{end}}{{end}}>
-              <button data-toggle="qor.datepicker" data-target-input=".qor-datetimepicker__input" class="mdl-button mdl-js-button mdl-button--icon qor-action__datepicker" type="button">
+              <button data-toggle="qor.datepicker" class="mdl-button mdl-js-button mdl-button--icon qor-action__datepicker" type="button">
                 <i class="material-icons">date_range</i>
               </button>
 
-              <button data-toggle="qor.timepicker" data-target-input=".qor-datetimepicker__input" class="mdl-button mdl-js-button mdl-button--icon qor-action__timepicker" type="button">
+              <button data-toggle="qor.timepicker" class="mdl-button mdl-js-button mdl-button--icon qor-action__timepicker" type="button">
                 <i class="material-icons">access_time</i>
               </button>
             </div>
@@ -98,11 +98,11 @@
           <div class="qor-field__edit qor-field__datetimepicker" data-picker-type="datetime">
             <input class="mdl-textfield__input qor-datetimepicker__input qor-pulish2__action-input qor-pulish2__action-end" data-start-date="true" data-action-type="scheduledend"  placeholder="{{meta_placeholder $scheduledEndAtMeta $context "YYYY-MM-DD HH:MM"}}" type="text" value="{{render_meta $result $scheduledEndAtMeta}}" {{if $scheduleEventIDMeta}}{{if $scheduleEvent.ID}}disabled{{end}}{{else if not (has_update_permission $scheduledEndAtMeta)}}disabled{{end}}>
             <div class="qor-action__picker-button" {{if $scheduleEventIDMeta}}{{if $scheduleEvent.ID}}style="display:none"{{end}}{{end}}>
-              <button data-toggle="qor.datepicker" data-target-input=".qor-datetimepicker__input" class="mdl-button mdl-js-button mdl-button--icon qor-action__datepicker" type="button">
+              <button data-toggle="qor.datepicker" class="mdl-button mdl-js-button mdl-button--icon qor-action__datepicker" type="button">
                 <i class="material-icons">date_range</i>
               </button>
 
-              <button data-toggle="qor.timepicker" data-target-input=".qor-datetimepicker__input" class="mdl-button mdl-js-button mdl-button--icon qor-action__timepicker" type="button">
+              <button data-toggle="qor.timepicker" class="mdl-button mdl-js-button mdl-button--icon qor-action__timepicker" type="button">
                 <i class="material-icons">access_time</i>
               </button>
             </div>
diff --git a/views/themes/publish2/actions/index/5.publish2.tmpl b/views/themes/publish2/actions/index/5.publish2.tmpl
index b93ffae..29dbcf7 100644
--- a/views/themes/publish2/actions/index/5.publish2.tmpl
+++ b/views/themes/publish2/actions/index/5.publish2.tmpl
@@ -41,11 +41,11 @@
           <input class="mdl-textfield__input qor-datetimepicker__input qor-filter__start" data-search-param="schedule_start_at" placeholder="{{meta_placeholder $scheduleStartAtMeta $context $scheduleStartAtMeta.Label}}" type="text" value="" />
         </div>
         <div>
-          <button data-toggle="qor.datepicker" data-target-input=".qor-datetimepicker__input" class="mdl-button mdl-js-button mdl-button--icon qor-action__datepicker" type="button">
+          <button data-toggle="qor.datepicker" class="mdl-button mdl-js-button mdl-button--icon qor-action__datepicker" type="button">
             <i class="material-icons">date_range</i>
           </button>
 
-          <button data-toggle="qor.timepicker" data-target-input=".qor-datetimepicker__input" class="mdl-button mdl-js-button mdl-button--icon qor-action__timepicker" type="button">
+          <button data-toggle="qor.timepicker" class="mdl-button mdl-js-button mdl-button--icon qor-action__timepicker" type="button">
             <i class="material-icons">access_time</i>
           </button>
         </div>
@@ -57,11 +57,11 @@
           <input class="mdl-textfield__input qor-datetimepicker__input qor-filter__end" data-search-param="schedule_end_at" placeholder="{{meta_placeholder $scheduleEndAtMeta $context $scheduleEndAtMeta.Label}}" type="text" value="" />
         </div>
         <div>
-          <button data-toggle="qor.datepicker" data-target-input=".qor-datetimepicker__input" class="mdl-button mdl-js-button mdl-button--icon qor-action__datepicker" type="button">
+          <button data-toggle="qor.datepicker" class="mdl-button mdl-js-button mdl-button--icon qor-action__datepicker" type="button">
             <i class="material-icons">date_range</i>
           </button>
 
-          <button data-toggle="qor.timepicker" data-target-input=".qor-datetimepicker__input" class="mdl-button mdl-js-button mdl-button--icon qor-action__timepicker" type="button">
+          <button data-toggle="qor.timepicker" class="mdl-button mdl-js-button mdl-button--icon qor-action__timepicker" type="button">
             <i class="material-icons">access_time</i>
           </button>
         </div>