diff --git a/frontend/src/metadata/components/dialog/file-tags-dialog/index.css b/frontend/src/metadata/components/dialog/file-tags-dialog/index.css
index a13633e426..c3285d4b86 100644
--- a/frontend/src/metadata/components/dialog/file-tags-dialog/index.css
+++ b/frontend/src/metadata/components/dialog/file-tags-dialog/index.css
@@ -14,6 +14,7 @@
   border: 1px solid #dedede;
   border-radius: 4px;
   margin-right: 8px;
+  margin-bottom: 8px;
   line-height: 26px;
   cursor: pointer;
 }
@@ -21,7 +22,3 @@
 .sf-metadata-auto-image-tags .auto-image-tag.selected {
   border-color: #FF9800;
 }
-
-.sf-metadata-auto-image-tags .auto-image-tag.selected::after {
-  content: ('');
-}
diff --git a/frontend/src/metadata/components/dialog/file-tags-dialog/index.js b/frontend/src/metadata/components/dialog/file-tags-dialog/index.js
index 6541562a8e..4c1d102819 100644
--- a/frontend/src/metadata/components/dialog/file-tags-dialog/index.js
+++ b/frontend/src/metadata/components/dialog/file-tags-dialog/index.js
@@ -12,6 +12,7 @@ import { getTagByName, getTagId } from '../../../../tag/utils';
 import { PRIVATE_COLUMN_KEY as TAGS_PRIVATE_COLUMN_KEY } from '../../../../tag/constants';
 import { SELECT_OPTION_COLORS } from '../../../constants';
 import { useTags } from '../../../../tag/hooks';
+import EmptyTip from '../../../../components/empty-tip';
 
 import './index.css';
 
@@ -140,14 +141,14 @@ const FileTagsDialog = ({ record, onToggle, onSubmit }) => {
                 })}
               </>
             ) : (
-              <div className="empty-tip">{gettext('No tags')}</div>
+              <EmptyTip className="w-100 h-100" text={gettext('No tags')} />
             )}
           </div>
         )}
       </ModalBody>
       <ModalFooter>
         <Button color="secondary" onClick={() => onToggle()}>{gettext('Cancel')}</Button>
-        <Button color="primary" disabled={isLoading || isSubmitting} onClick={handelSubmit}>{gettext('Submit')}</Button>
+        <Button color="primary" disabled={isLoading || isSubmitting || fileTags.length === 0} onClick={handelSubmit}>{gettext('Submit')}</Button>
       </ModalFooter>
     </Modal>
   );