diff --git a/superset-frontend/src/features/tags/TagModal.tsx b/superset-frontend/src/features/tags/TagModal.tsx
index 4339d69130..a0ac8636a5 100644
--- a/superset-frontend/src/features/tags/TagModal.tsx
+++ b/superset-frontend/src/features/tags/TagModal.tsx
@@ -88,6 +88,14 @@ const TagModal: React.FC<TagModalProps> = ({
     setSavedQueriesToTag([]);
   };
 
+  const clearTagForm = () => {
+    setTagName('');
+    setDescription('');
+    setDashboardsToTag([]);
+    setChartsToTag([]);
+    setSavedQueriesToTag([]);
+  };
+
   useEffect(() => {
     const resourceMap: { [key: string]: TaggableResourceOption[] } = {
       [TaggableResources.Dashboard]: [],
@@ -225,7 +233,9 @@ const TagModal: React.FC<TagModalProps> = ({
       })
         .then(({ json = {} }) => {
           refreshData();
+          clearTagForm();
           addSuccessToast(t('Tag updated'));
+          onHide();
         })
         .catch(err => {
           addDangerToast(err.message || 'Error Updating Tag');
@@ -241,24 +251,19 @@ const TagModal: React.FC<TagModalProps> = ({
       })
         .then(({ json = {} }) => {
           refreshData();
+          clearTagForm();
           addSuccessToast(t('Tag created'));
+          onHide();
         })
         .catch(err => addDangerToast(err.message || 'Error Creating Tag'));
     }
-    onHide();
   };
 
   return (
     <Modal
       title={modalTitle}
       onHide={() => {
-        if (clearOnHide) {
-          setTagName('');
-          setDescription('');
-          setDashboardsToTag([]);
-          setChartsToTag([]);
-          setSavedQueriesToTag([]);
-        }
+        if (clearOnHide) clearTagForm();
         onHide();
       }}
       show={show}