diff --git a/frontend/src/metadata/metadata-view/components/popover/rename-popover/index.css b/frontend/src/metadata/metadata-view/components/popover/rename-popover/index.css
index fae1290307..29e5eb344c 100644
--- a/frontend/src/metadata/metadata-view/components/popover/rename-popover/index.css
+++ b/frontend/src/metadata/metadata-view/components/popover/rename-popover/index.css
@@ -3,11 +3,3 @@
   min-width: 350px;
   width: 350px;
 }
-
-.sf-metadata-rename-column-popover .popover-body {
-  padding: 16px;
-}
-
-.sf-metadata-rename-column-popover .form-group {
-  margin-bottom: 0;
-}
diff --git a/frontend/src/metadata/metadata-view/components/popover/rename-popover/index.js b/frontend/src/metadata/metadata-view/components/popover/rename-popover/index.js
index 1a2424342d..c4b5d95d0b 100644
--- a/frontend/src/metadata/metadata-view/components/popover/rename-popover/index.js
+++ b/frontend/src/metadata/metadata-view/components/popover/rename-popover/index.js
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
-import { Form, FormGroup, Input, PopoverBody } from 'reactstrap';
+import { Input, PopoverBody } from 'reactstrap';
 import { CustomizePopover } from '@seafile/sf-metadata-ui-component';
 import { KeyCodes } from '../../../../../constants';
 import { ValidateColumnFormFields } from '../column-popover/utils';
@@ -23,13 +23,17 @@ const RenamePopover = ({ value: oldValue, target, onToggle, onSubmit }) => {
   }, [value]);
 
   const handleSubmit = useCallback(() => {
+    if (value === oldValue) {
+      onToggle();
+      return;
+    }
     const valueError = ValidateColumnFormFields[COMMON_FORM_FIELD_TYPE.COLUMN_NAME]({ columnName: value, metadata, gettext });
     if (valueError) {
       toaster.danger(valueError.tips);
       return;
     }
     onSubmit(value);
-  }, [value, metadata, onSubmit]);
+  }, [value, oldValue, metadata, onSubmit, onToggle]);
 
   const onHotKey = useCallback((event) => {
     if (event.keyCode === KeyCodes.Enter) {
@@ -52,12 +56,8 @@ const RenamePopover = ({ value: oldValue, target, onToggle, onSubmit }) => {
 
   return (
     <CustomizePopover target={target} className="sf-metadata-rename-column-popover" hide={handleSubmit} hideWithEsc={onToggle}>
-      <PopoverBody>
-        <Form>
-          <FormGroup>
-            <Input value={value} innerRef={inputRef} onClick={onClick} onChange={onChange} />
-          </FormGroup>
-        </Form>
+      <PopoverBody className='p-4'>
+        <Input value={value} innerRef={inputRef} onClick={onClick} onChange={onChange} />
       </PopoverBody>
     </CustomizePopover>
   );