diff --git a/src/components/Branches/BranchSelect.js b/src/components/Branches/BranchSelect.js
new file mode 100644
index 000000000..02f693705
--- /dev/null
+++ b/src/components/Branches/BranchSelect.js
@@ -0,0 +1,69 @@
+import React from 'react';
+
+import { MenuItem, Button } from '@blueprintjs/core';
+import { FSelect } from '../Forms';
+
+/**
+ *
+ * @param {*} query
+ * @param {*} branch
+ * @param {*} _index
+ * @param {*} exactMatch
+ * @returns
+ */
+const branchItemPredicate = (query, branch, _index, exactMatch) => {
+  const normalizedTitle = branch.name.toLowerCase();
+  const normalizedQuery = query.toLowerCase();
+
+  if (exactMatch) {
+    return normalizedTitle === normalizedQuery;
+  } else {
+    return `${branch.code}. ${normalizedTitle}`.indexOf(normalizedQuery) >= 0;
+  }
+};
+
+/**
+ *
+ * @param {*} film
+ * @param {*} param1
+ * @returns
+ */
+const branchItemRenderer = (branch, { handleClick, modifiers, query }) => {
+  const text = `${branch.name}`;
+
+  return (
+    <MenuItem
+      active={modifiers.active}
+      disabled={modifiers.disabled}
+      label={branch.name.toString()}
+      key={branch.id}
+      onClick={handleClick}
+      text={text}
+    />
+  );
+};
+
+const branchSelectProps = {
+  itemPredicate: branchItemPredicate,
+  itemRenderer: branchItemRenderer,
+  valueAccessor: 'id',
+  labelAccessor: 'name',
+};
+
+/**
+ *
+ * @param {*} param0
+ * @returns
+ */
+export function BranchSelect({ branches, ...rest }) {
+  return <FSelect {...branchSelectProps} {...rest} items={branches} />;
+}
+
+/**
+ *
+ * @param {*} param0
+ * @returns
+ */
+export function BranchSelectButton({ label, ...rest }) {
+  return <Button text={label} {...rest} />;
+}
diff --git a/src/components/Branches/index.js b/src/components/Branches/index.js
new file mode 100644
index 000000000..a4f97cb33
--- /dev/null
+++ b/src/components/Branches/index.js
@@ -0,0 +1 @@
+export * from './BranchSelect';
\ No newline at end of file
diff --git a/src/components/Forms/FSelect.tsx b/src/components/Forms/FSelect.tsx
new file mode 100644
index 000000000..2496f1b7a
--- /dev/null
+++ b/src/components/Forms/FSelect.tsx
@@ -0,0 +1,85 @@
+// @ts-nocheck
+import React from 'react';
+import {
+  Select as BPSelect,
+  SelectProps as BPSelectProps,
+} from '@blueprintjs/select';
+import { Field, FieldProps, FieldConfig, isFunction } from 'formik';
+import { get } from 'lodash';
+
+interface SelectProps
+  extends Omit<FieldConfig, 'children' | 'as' | 'component'>,
+    BPSelectProps<any> {
+  valueAccessor: string;
+  labelAccessor: string;
+  input: () => JSX.Element;
+}
+
+interface FieldToSelectProps
+  extends Omit<BPSelectProps<any>, 'onItemSelect'>,
+    FieldProps {
+  onItemSelect?: (item: any, event?: React.SyntheticEvent<HTMLElement>) => void;
+  valueAccessor: string;
+  labelAccessor: string;
+  input: (props: { activeItem: any; label: any }) => JSX.Element;
+  children: JSX.Element;
+}
+
+const getAccessor = (accessor: any, activeItem: any) => {
+  return isFunction(accessor)
+    ? accessor(activeItem)
+    : get(activeItem, accessor);
+};
+
+/**
+ * Transform field props to select props.
+ * @param   {FieldToSelectProps}
+ * @returns {BPSelectProps<any> }
+ */
+function transformSelectToFieldProps({
+  field: { onBlur: onFieldBlur, ...field },
+  form: { touched, errors, ...form },
+  meta,
+  input,
+  valueAccessor,
+  labelAccessor,
+  ...props
+}: FieldToSelectProps): BPSelectProps<any> {
+  const activeItem = props.items.find(
+    (item) => getAccessor(valueAccessor, item) === field.value
+  );
+  const children = input
+    ? input({
+        activeItem,
+        label: getAccessor(labelAccessor, activeItem),
+      })
+    : props.children;
+
+  return {
+    onItemSelect: (item) => {
+      const value = getAccessor(valueAccessor, item);
+      form.setFieldValue(field.name, value);
+    },
+    activeItem,
+    ...props,
+    children,
+  };
+}
+
+/**
+ *
+ * @param   {FieldToSelectProps}
+ * @returns {JSX.Element}
+ */
+function FieldToSelect({ ...props }: FieldToSelectProps): JSX.Element {
+  return <BPSelect {...transformSelectToFieldProps(props)} />;
+}
+
+/**
+ * Select binded with formik.
+ * @param   {JSX.Element}
+ * @returns {SelectProps}
+ */
+export function FSelect({ ...props }: SelectProps): JSX.Element {
+  return <Field {...props} component={FieldToSelect} />;
+}
\ No newline at end of file
diff --git a/src/components/Forms/index.js b/src/components/Forms/index.js
index c6221811d..bd39f1317 100644
--- a/src/components/Forms/index.js
+++ b/src/components/Forms/index.js
@@ -1,4 +1,5 @@
 export * from './FormObserver';
 export * from './FormikObserver';
 export * from './FMoneyInputGroup'
-export * from './FFormGroup'
\ No newline at end of file
+export * from './FFormGroup'
+export * from './FSelect'
\ No newline at end of file
diff --git a/src/components/Warehouses/WarehouseSelect.js b/src/components/Warehouses/WarehouseSelect.js
new file mode 100644
index 000000000..dd0af73dc
--- /dev/null
+++ b/src/components/Warehouses/WarehouseSelect.js
@@ -0,0 +1,74 @@
+import React from 'react';
+
+import { MenuItem, Button } from '@blueprintjs/core';
+import { FSelect } from '../Forms';
+
+/**
+ *
+ * @param {*} query
+ * @param {*} warehouse
+ * @param {*} _index
+ * @param {*} exactMatch
+ * @returns
+ */
+const warehouseItemPredicate = (query, warehouse, _index, exactMatch) => {
+  const normalizedTitle = warehouse.name.toLowerCase();
+  const normalizedQuery = query.toLowerCase();
+
+  if (exactMatch) {
+    return normalizedTitle === normalizedQuery;
+  } else {
+    return (
+      `${warehouse.code}. ${normalizedTitle}`.indexOf(normalizedQuery) >= 0
+    );
+  }
+};
+
+/**
+ *
+ * @param {*} film
+ * @param {*} param1
+ * @returns
+ */
+const warehouseItemRenderer = (
+  warehouse,
+  { handleClick, modifiers, query },
+) => {
+  const text = `${warehouse.name}`;
+
+  return (
+    <MenuItem
+      active={modifiers.active}
+      disabled={modifiers.disabled}
+      label={warehouse.name.toString()}
+      key={warehouse.id}
+      onClick={handleClick}
+      text={text}
+    />
+  );
+};
+
+const warehouseSelectProps = {
+  itemPredicate: warehouseItemPredicate,
+  itemRenderer: warehouseItemRenderer,
+  valueAccessor: 'id',
+  labelAccessor: 'name',
+};
+
+/**
+ *
+ * @param {*} param0
+ * @returns
+ */
+export function WarehouseSelect({ warehouses, ...rest }) {
+  return <FSelect {...warehouseSelectProps} {...rest} items={warehouses} />;
+}
+
+/**
+ *
+ * @param {*} param0
+ * @returns
+ */
+export function WarehouseSelectButton({ label, ...rest }) {
+  return <Button text={label} />;
+}
diff --git a/src/components/Warehouses/index.js b/src/components/Warehouses/index.js
new file mode 100644
index 000000000..3b38eb9e6
--- /dev/null
+++ b/src/components/Warehouses/index.js
@@ -0,0 +1 @@
+export * from './WarehouseSelect';
\ No newline at end of file
diff --git a/src/components/index.js b/src/components/index.js
index bb40a47ed..29023a1b1 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -98,7 +98,10 @@ export * from './FinancialStatement';
 export * from './FinancialReport';
 export * from './FinancialSheet';
 export * from './FeatureGuard';
-export * from './ExchangeRate'
+export * from './ExchangeRate';
+export * from './Branches';
+export * from './Warehouses';
+
 const Hint = FieldHint;
 
 const T = FormattedMessage;
diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js
index 871bd475b..2394c8430 100644
--- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js
+++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js
@@ -1,26 +1,27 @@
 import React from 'react';
-import { FastField, Field } from 'formik';
 import {
   Alignment,
   Navbar,
   NavbarGroup,
   NavbarDivider,
+  Button,
 } from '@blueprintjs/core';
+import intl from 'react-intl-universal';
 
 import { useFeatureCan } from 'hooks/state';
-import {
-  Icon,
-  FormattedMessage as T,
-  CustomSelectList,
-  FeatureCan,
-} from 'components';
+import { Icon, BranchSelect, FeatureCan, WarehouseSelect } from 'components';
 import { useInvoiceFormContext } from './InvoiceFormProvider';
 import { Features } from 'common';
 
+/**
+ * Invoice form topbar .
+ * @returns {JSX.Element}
+ */
 export default function InvoiceFormTopBar() {
-  const { branches, warehouses, isWarehouesLoading, isBranchesLoading } =
-    useInvoiceFormContext();
+  // Invoice form context.
+  const { branches, warehouses } = useInvoiceFormContext();
 
+  // Features guard.
   const { featureCan } = useFeatureCan();
 
   // Can't display the navigation bar if warehouses or branches feature is not enabled.
@@ -31,46 +32,52 @@ export default function InvoiceFormTopBar() {
     <Navbar className={'navbar--dashboard-topbar'}>
       <NavbarGroup align={Alignment.LEFT}>
         <FeatureCan feature={Features.Warehouses}>
-          <Field name={'branch_id'}>
-            {({ form, field: { value }, meta: { error, touched } }) => (
-              <CustomSelectList
-                items={branches}
-                loading={isBranchesLoading}
-                defaultSelectText={'Branch'}
-                onItemSelected={({ id }) => {
-                  form.setFieldValue('branch_id', id);
-                }}
-                selectedItemId={value}
-                buttonProps={{
-                  icon: <Icon icon={'branch-16'} iconSize={16} />,
-                }}
-              />
-            )}
-          </Field>
+          <BranchSelect
+            name={'branch_id'}
+            branches={branches}
+            input={InvoiceBranchSelectButton}
+            popoverProps={{
+              minimal: true,
+            }}
+          />
         </FeatureCan>
 
         {featureCan(Features.Warehouses) && featureCan(Features.Branches) && (
           <NavbarDivider />
         )}
         <FeatureCan feature={Features.Warehouses}>
-          <Field name={'warehouse_id'}>
-            {({ form, field: { value }, meta: { error, touched } }) => (
-              <CustomSelectList
-                items={warehouses}
-                loading={isWarehouesLoading}
-                defaultSelectText={'Warehosue'}
-                onItemSelected={({ id }) => {
-                  form.setFieldValue('warehouse_id', id);
-                }}
-                selectedItemId={value}
-                buttonProps={{
-                  icon: <Icon icon={'warehouse-16'} iconSize={16} />,
-                }}
-              />
-            )}
-          </Field>
+          <WarehouseSelect
+            name={'warehouse_id'}
+            warehouses={warehouses}
+            input={InvoiceWarehouseSelectButton}
+            popoverProps={{
+              minimal: true,
+            }}
+          />
         </FeatureCan>
       </NavbarGroup>
     </Navbar>
   );
 }
+
+function InvoiceWarehouseSelectButton({ label }) {
+  return (
+    <Button
+      text={intl.get('invoice.branch_button.label', { label })}
+      minimal={true}
+      small={true}
+      icon={<Icon icon={'warehouse-16'} iconSize={16} />}
+    />
+  );
+}
+
+function InvoiceBranchSelectButton({ label }) {
+  return (
+    <Button
+      text={intl.get('invoice.warehouse_button.label', { label })}
+      minimal={true}
+      small={true}
+      icon={<Icon icon={'branch-16'} iconSize={16} />}
+    />
+  );
+}
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index cd209dc94..f71e9bae9 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -1851,5 +1851,7 @@
   "warehouse_activate.dialog_success_message": "Multi-branches feature has been activated successfully.",
   "warehouse.alert.mark_primary_message": "The given warehouse has been marked as primary.",
   "warehouse.alert.are_you_sure_you_want_to_make": "Are you sure you want to make a primary warehouse?",
-  "make_primary": "Make as Primary"
+  "make_primary": "Make as Primary",
+  "invoice.branch_button.label": "Branch: {label}",
+  "invoice.warehouse_button.label": "Warehouse: {label}"
 }
\ No newline at end of file