diff --git a/src/client/Elements/Button.jsx b/src/client/Elements/Button.jsx
index 459c044..cca8510 100644
--- a/src/client/Elements/Button.jsx
+++ b/src/client/Elements/Button.jsx
@@ -6,7 +6,7 @@ const Button = ({ status, action, text, ...props }) => {
   return (
     <AntButton
       {...props}
-      disabled={status === Status.Disabled || status === Status.Loading}
+      disabled={status === Status.Disabled}
       loading={status === Status.Loading}
       onClick={() => {
         if (action) action();
diff --git a/src/client/Elements/Select.jsx b/src/client/Elements/Select.jsx
index c8d631a..32be8fe 100644
--- a/src/client/Elements/Select.jsx
+++ b/src/client/Elements/Select.jsx
@@ -15,7 +15,7 @@ const Select = ({
     <Form.Item validateStatus={validateStatus} help={message}>
       <AntSelect
         {...props}
-        disabled={status === Status.Disabled || status === Status.Loading}
+        disabled={status === Status.Disabled}
         loading={status === Status.Loading}
         optionFilterProp="children"
         value={value}
diff --git a/src/client/hocs/withStore.js b/src/client/hocs/withStore.js
index 5d0c84d..32631d6 100644
--- a/src/client/hocs/withStore.js
+++ b/src/client/hocs/withStore.js
@@ -119,5 +119,5 @@ export const withStoreButton = Button => ({ name, actionName, ...params }) => {
 
     return <Button {...params} status={status} action={action} />;
   };
-  return ButtonWithStore;
+  return observer(ButtonWithStore);
 };