diff --git a/src/components/User/Client/ClientShifts.jsx b/src/components/User/Client/ClientShifts.jsx
index f163833..d647323 100644
--- a/src/components/User/Client/ClientShifts.jsx
+++ b/src/components/User/Client/ClientShifts.jsx
@@ -129,7 +129,7 @@ class ClientShifts extends Component {
     this.props.dispatch(deleteCShiftRequest(uuid));
   };
 
-  approveHoursCShift = cshift => {
+  approveHoursCShift = async cshift => {
     const {
       set_start: approved_start,
       set_end: approved_end,
@@ -145,6 +145,7 @@ class ClientShifts extends Component {
         set_end: null
       })
     );
+    await new Promise(resolve => setTimeout(resolve, 500));
     this.props.dispatch(
       getCShiftsRequest({
         page: this.props.page,
diff --git a/src/components/User/Provider/ProviderShift.jsx b/src/components/User/Provider/ProviderShift.jsx
index 504c32a..846c903 100644
--- a/src/components/User/Provider/ProviderShift.jsx
+++ b/src/components/User/Provider/ProviderShift.jsx
@@ -172,6 +172,7 @@ const ProviderShiftFormView = ({
         </Message>
       )}
       {!checkedIn && (
+        <div>
         <Button.Group>
           {!approved && (
             <Button
@@ -190,6 +191,7 @@ const ProviderShiftFormView = ({
             </Button>
           )}
         </Button.Group>
+        </div>
       )}
       {shift.approved_start && (
         <Fragment>