diff --git a/packages/strapi-admin/admin/src/components/HeadersInput/index.js b/packages/strapi-admin/admin/src/components/HeadersInput/index.js
index 8186f123ee..9a30c00f21 100644
--- a/packages/strapi-admin/admin/src/components/HeadersInput/index.js
+++ b/packages/strapi-admin/admin/src/components/HeadersInput/index.js
@@ -11,7 +11,7 @@ import Wrapper from './Wrapper';
 import keys from './keys';
 
 const HeadersInput = ({ onClick, onChange, name, value }) => {
-  const handleChange = (selected, name) => {
+  const handleChangeKey = (selected, name) => {
     if (selected === null) {
       onChange({ target: { name, value: '' } });
     } else {
@@ -63,14 +63,18 @@ const HeadersInput = ({ onClick, onChange, name, value }) => {
               <section>
                 <CreatableSelect
                   isClearable
-                  onChange={e => handleChange(e, `${name}.${index}.key`)}
+                  onChange={e => handleChangeKey(e, `${name}.${index}.key`)}
                   options={options}
                   name={`${name}.${index}.key`}
                   value={optionFormat(key)}
                 />
               </section>
               <section>
-                <InputText value={value} name={`${name}.${index}.value`} />
+                <InputText
+                  value={value}
+                  name={`${name}.${index}.value`}
+                  onChange={onChange}
+                />
               </section>
               <div>
                 <CircleButton
diff --git a/packages/strapi-admin/admin/src/components/TriggerContainer/index.js b/packages/strapi-admin/admin/src/components/TriggerContainer/index.js
index a42e53fbbf..14a21bebc1 100644
--- a/packages/strapi-admin/admin/src/components/TriggerContainer/index.js
+++ b/packages/strapi-admin/admin/src/components/TriggerContainer/index.js
@@ -36,7 +36,7 @@ const TriggerContainer = ({ isPending, onCancel, response }) => {
                 ) : (
                   <>
                     <td>Error 403</td>
-                    <td>{error}</td>
+                    <td title={{ error }}>{error}</td>
                   </>
                 )}
               </>
diff --git a/packages/strapi-admin/admin/src/containers/Webhooks/EditView/index.js b/packages/strapi-admin/admin/src/containers/Webhooks/EditView/index.js
index 389b24edad..32510c22f4 100644
--- a/packages/strapi-admin/admin/src/containers/Webhooks/EditView/index.js
+++ b/packages/strapi-admin/admin/src/containers/Webhooks/EditView/index.js
@@ -6,7 +6,7 @@
 
 import React, { useEffect, useReducer } from 'react';
 import { useLocation } from 'react-router-dom';
-import { isEmpty, isEqual } from 'lodash';
+import { cloneDeep, isEmpty, isEqual, set } from 'lodash';
 import { Header } from '@buffetjs/custom';
 import { Play } from '@buffetjs/icons';
 import { request, useGlobalContext } from 'strapi-helper-plugin';
@@ -66,6 +66,8 @@ function EditView() {
     : name;
 
   const actionsAreDisabled = isEqual(initialWebhook, modifiedWebhook);
+  const triggerActionIsDisabled =
+    isCreatingWebhook || (!isCreatingWebhook && !actionsAreDisabled);
 
   const handleTrigger = async () => {
     dispatch({
@@ -98,8 +100,7 @@ function EditView() {
   const actions = [
     {
       color: 'primary',
-      disabled:
-        isCreatingWebhook || (!isCreatingWebhook && !actionsAreDisabled),
+      disabled: triggerActionIsDisabled,
       type: 'button',
       label: formatMessage({
         id: `Settings.webhooks.trigger`,
@@ -111,7 +112,18 @@ function EditView() {
         paddingRight: 15,
         paddingLeft: 15,
       },
-      icon: <Play width="6px" height="7px" />,
+      title: triggerActionIsDisabled
+        ? formatMessage({
+            id: `Settings.webhooks.trigger.save`,
+          })
+        : null,
+      icon: (
+        <Play
+          width="6px"
+          height="7px"
+          fill={triggerActionIsDisabled ? '#b4b6ba' : '#ffffff'}
+        />
+      ),
     },
     {
       onClick: () => {},
@@ -161,40 +173,81 @@ function EditView() {
     });
   };
 
+  const handleSubmit = e => {
+    e.preventDefault();
+    createWebhooks();
+  };
+
+  const createWebhooks = async () => {
+    const body = cloneDeep(modifiedWebhook);
+    set(body, 'headers', unformatLayout(modifiedWebhook.headers));
+
+    try {
+      const body = cloneDeep(modifiedWebhook);
+      set(body, 'headers', unformatLayout(modifiedWebhook.headers));
+
+      await request(`/admin/webhooks`, {
+        method: 'POST',
+        body,
+      });
+
+      dispatch({
+        type: 'SUBMIT_SUCCEEDED',
+      });
+    } catch (err) {
+      strapi.notification.error('notification.error');
+    }
+  };
+
+  // utils
+  const unformatLayout = headers => {
+    const newHeader = headers.reduce((obj, item) => {
+      const { key, value } = item;
+      return {
+        ...obj,
+        [key]: value,
+      };
+    }, {});
+
+    return newHeader;
+  };
+
   return (
     <Wrapper>
-      <Header {...headerProps} />
-      {(isTriggering || !isEmpty(triggerResponse)) && (
-        <div className="trigger-wrapper">
-          <TriggerContainer
-            isPending={isTriggering}
-            response={triggerResponse}
-          />
-        </div>
-      )}
-      <div className="form-wrapper">
-        <div className="form-card">
-          <div className="row">
-            {Object.keys(form).map(key => {
-              return (
-                <div key={key} className={form[key].styleName}>
-                  <Inputs
-                    {...form[key]}
-                    // customInputs={{
-                    //   headers: HeadersInput,
-                    // }}
-                    name={key}
-                    onChange={handleChange}
-                    onClick={handleClick}
-                    validations={form[key].validations}
-                    value={modifiedWebhook[key] || form[key].value}
-                  />
-                </div>
-              );
-            })}
+      <form onSubmit={handleSubmit}>
+        <Header {...headerProps} />
+        {(isTriggering || !isEmpty(triggerResponse)) && (
+          <div className="trigger-wrapper">
+            <TriggerContainer
+              isPending={isTriggering}
+              response={triggerResponse}
+            />
+          </div>
+        )}
+        <div className="form-wrapper">
+          <div className="form-card">
+            <div className="row">
+              {Object.keys(form).map(key => {
+                return (
+                  <div key={key} className={form[key].styleName}>
+                    <Inputs
+                      {...form[key]}
+                      // customInputs={{
+                      //   headers: HeadersInput,
+                      // }}
+                      name={key}
+                      onChange={handleChange}
+                      onClick={handleClick}
+                      validations={form[key].validations}
+                      value={modifiedWebhook[key] || form[key].value}
+                    />
+                  </div>
+                );
+              })}
+            </div>
           </div>
         </div>
-      </div>
+      </form>
     </Wrapper>
   );
 }
diff --git a/packages/strapi-admin/admin/src/translations/en.json b/packages/strapi-admin/admin/src/translations/en.json
index d95efc8cd5..ad5be5a550 100644
--- a/packages/strapi-admin/admin/src/translations/en.json
+++ b/packages/strapi-admin/admin/src/translations/en.json
@@ -235,6 +235,7 @@
   "Settings.webhooks.trigger": "Trigger",
   "Settings.webhooks.trigger.title": "Save before Trigger",
   "Settings.webhooks.trigger.cancel": "Cancel trigger",
+  "Settings.webhooks.trigger.save": "Please save to trigger",
   "Settings.webhooks.events.create": "Create",
   "Settings.webhooks.events.edit": "Edit",
   "Settings.webhooks.events.delete": "Delete",