diff --git a/frontend/src/metadata/metadata-tree-view/index.js b/frontend/src/metadata/metadata-tree-view/index.js
index 69bbfb17b6..37b87aef8f 100644
--- a/frontend/src/metadata/metadata-tree-view/index.js
+++ b/frontend/src/metadata/metadata-tree-view/index.js
@@ -140,7 +140,14 @@ const MetadataTreeView = ({ userPerm, repoID, currentPath, onNodeClick }) => {
                   onMove={onMoveView}
                 />);
             })}
-            {canAdd && (<CustomizeAddTool className="sf-metadata-add-view" callBack={openAddView} footerName={gettext('Add view')} addIconClassName="sf-metadata-add-view-icon" />)}
+            {canAdd &&
+              <CustomizeAddTool
+                className="sf-metadata-add-view"
+                callBack={openAddView}
+                footerName={gettext('Add view')}
+                addIconClassName="sf-metadata-add-view-icon"
+              />
+            }
           </div>
         </div>
       </div>
diff --git a/frontend/src/metadata/metadata-tree-view/name-dialog/index.js b/frontend/src/metadata/metadata-tree-view/name-dialog/index.js
index b077fe7fa9..f6eb481ee6 100644
--- a/frontend/src/metadata/metadata-tree-view/name-dialog/index.js
+++ b/frontend/src/metadata/metadata-tree-view/name-dialog/index.js
@@ -55,8 +55,9 @@ const NameDialog = ({ value: oldName, title, onSubmit, onToggle }) => {
   const onHotKey = useCallback((event) => {
     if (event.keyCode === KeyCodes.Enter) {
       event.preventDefault();
+      submit();
     }
-  }, []);
+  }, [submit]);
 
   useEffect(() => {
     document.addEventListener('keydown', onHotKey);
diff --git a/frontend/src/metadata/metadata-view/components/data-process-setter/groupby-setter.jsx b/frontend/src/metadata/metadata-view/components/data-process-setter/groupby-setter.jsx
index 7e67681d15..2f1fd7da29 100644
--- a/frontend/src/metadata/metadata-view/components/data-process-setter/groupby-setter.jsx
+++ b/frontend/src/metadata/metadata-view/components/data-process-setter/groupby-setter.jsx
@@ -22,7 +22,7 @@ const GroupbySetter = ({ columns: allColumns, groupbys: propsGroupbys, wrapperCl
     if (groupbysLength === 1) return gettext('Grouped by 1 column');
     if (groupbysLength > 1) return gettext('Grouped by xxx columns').replace('xxx', groupbysLength);
     // need to translate to Group
-    return gettext('Group_by');
+    return gettext('Group by');
   }, [groupbys]);
 
   const onSetterToggle = useCallback(() => {
diff --git a/frontend/src/metadata/metadata-view/components/popover/column-popover/name/index.js b/frontend/src/metadata/metadata-view/components/popover/column-popover/name/index.js
index ef597f46b1..44326a5ec9 100644
--- a/frontend/src/metadata/metadata-view/components/popover/column-popover/name/index.js
+++ b/frontend/src/metadata/metadata-view/components/popover/column-popover/name/index.js
@@ -26,7 +26,13 @@ const Name = forwardRef(({ readOnly, value }, ref) => {
 
   return (
     <FormGroup className={classnames('sf-metadata-column-settings-item', { 'is-invalid': error })}>
-      <Input placeholder={gettext('Column name')} value={name} onChange={onNameChange} readOnly={readOnly} />
+      <Input
+        placeholder={gettext('Column name')}
+        value={name}
+        onChange={onNameChange}
+        readOnly={readOnly}
+        autoFocus={true}
+      />
       {error && (<FormFeedback>{error}</FormFeedback>)}
     </FormGroup>
   );
diff --git a/frontend/src/metadata/metadata-view/components/popover/options-popover/index.js b/frontend/src/metadata/metadata-view/components/popover/options-popover/index.js
index d6e1fc2ff0..e6a54ac645 100644
--- a/frontend/src/metadata/metadata-view/components/popover/options-popover/index.js
+++ b/frontend/src/metadata/metadata-view/components/popover/options-popover/index.js
@@ -71,11 +71,12 @@ const OptionsPopover = ({ target, column, onToggle, onSubmit }) => {
   }, [options, displayOptions, onChange]);
 
   const onAdd = useCallback(() => {
-    const newOption = generateNewOption(options, searchValue?.trim() || '');
+    const newOptionName = searchValue?.trim() || '';
+    const newOption = generateNewOption(options, newOptionName);
     const newOptions = options.slice(0);
     newOptions.push(newOption);
     onChange(newOptions);
-    setEditingOptionId(newOption.id);
+    setEditingOptionId(newOptionName ? '' : newOption.id);
   }, [searchValue, options, onChange]);
 
   const onDelete = useCallback((optionId) => {
diff --git a/frontend/src/metadata/metadata-view/components/popover/options-popover/option/index.js b/frontend/src/metadata/metadata-view/components/popover/options-popover/option/index.js
index 17f9e61bdf..3b74a6deae 100644
--- a/frontend/src/metadata/metadata-view/components/popover/options-popover/option/index.js
+++ b/frontend/src/metadata/metadata-view/components/popover/options-popover/option/index.js
@@ -58,6 +58,7 @@ const Option = ({
   onDelete: propsDelete, onUpdate,
   onMouseLeave, onMouseEnter: propsMouseEnter, onToggleFreeze, onOpenNameEditor, onCloseNameEditor,
 }) => {
+
   const onDelete = useCallback((event) => {
     event.nativeEvent.stopImmediatePropagation();
     propsDelete(option.id);