diff --git a/src/client/Elements/Button.jsx b/src/client/Elements/Button.jsx
index e8d515f..eef3dd3 100644
--- a/src/client/Elements/Button.jsx
+++ b/src/client/Elements/Button.jsx
@@ -6,7 +6,8 @@ const Button = ({ status, onClick, text, ...props }) => {
   return (
     <AntButton
       {...props}
-      disabled={status === Status.Disabled}
+      disabled={status === Status.Disabled || status === Status.Loading}
+      loading={status === Status.Loading}
       onClick={onClick}
     >
       {text}
diff --git a/src/client/Elements/Select.jsx b/src/client/Elements/Select.jsx
index 54ff536..4a62739 100644
--- a/src/client/Elements/Select.jsx
+++ b/src/client/Elements/Select.jsx
@@ -7,7 +7,8 @@ const Select = ({ value, setCurrentValue, status, options, ...props }) => {
     <Form.Item>
       <AntSelect
         {...props}
-        disabled={status === Status.Disabled}
+        disabled={status === Status.Disabled || status === Status.Loading}
+        loading={status === Status.Loading}
         optionFilterProp="children"
         value={value}
         onChange={val => setCurrentValue(val)}
diff --git a/src/core/types/statuses.ts b/src/core/types/statuses.ts
index 581fb2d..c1a65b2 100644
--- a/src/core/types/statuses.ts
+++ b/src/core/types/statuses.ts
@@ -4,6 +4,7 @@ export enum Status {
   Default,
   Disabled,
   Hidden,
+  Loading,
   Readonly,
 }