diff --git a/client/src/containers/Customers/CustomerFinancialPanel.js b/client/src/containers/Customers/CustomerFinancialPanel.js
index 7c8da19d3..398afb136 100644
--- a/client/src/containers/Customers/CustomerFinancialPanel.js
+++ b/client/src/containers/Customers/CustomerFinancialPanel.js
@@ -61,7 +61,7 @@ function CustomerFinancialPanel({
           {/*------------ Opening balance  -----------*/}
           <FastField name={'opening_balance'}>
             {({
-              form: { values },
+              form,
               field,
               field: { value },
               meta: { error, touched },
@@ -76,12 +76,14 @@ function CustomerFinancialPanel({
                 inline={true}
               >
                 <ControlGroup>
-                  <InputPrependText text={values.currency_code} />
+                  <InputPrependText text={form.values.currency_code} />
                   <MoneyInputGroup
                     value={value}
                     inputGroupProps={{ fill: true }}
                     disabled={customerId}
-                    {...field}
+                    onChange={(balance) => {
+                      form.setFieldValue('opening_balance', balance);
+                    }}
                   />
                 </ControlGroup>
               </FormGroup>
diff --git a/client/src/containers/Vendors/VendorFinanicalPanelTab.js b/client/src/containers/Vendors/VendorFinanicalPanelTab.js
index 095ac72b6..5397f5b91 100644
--- a/client/src/containers/Vendors/VendorFinanicalPanelTab.js
+++ b/client/src/containers/Vendors/VendorFinanicalPanelTab.js
@@ -63,12 +63,7 @@ function VendorFinanicalPanelTab({
           </FastField>
           {/*------------ Opening balance  -----------*/}
           <FastField name={'opening_balance'}>
-            {({
-              form: { values },
-              field,
-              field: { value },
-              meta: { error, touched },
-            }) => (
+            {({ form, field, field: { value }, meta: { error, touched } }) => (
               <FormGroup
                 label={<T id={'opening_balance'} />}
                 className={classNames(
@@ -79,14 +74,15 @@ function VendorFinanicalPanelTab({
                 inline={true}
               >
                 <ControlGroup>
-                  <InputPrependText text={values.currency_code} />
+                  <InputPrependText text={form.values.currency_code} />
                   <MoneyInputGroup
                     value={value}
-                    onChange={field.onChange}
-                    prefix={'$'}
                     inputGroupProps={{
                       fill: true,
-                      ...field,
+                      // ...field,
+                    }}
+                    onChange={(balance) => {
+                      form.setFieldValue('opening_balance', balance);
                     }}
                     disabled={vendorId}
                   />