diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveGlossaryEntityModal.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveGlossaryEntityModal.tsx
index 37a625f58100b3..eb49bb8b07e40f 100644
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveGlossaryEntityModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveGlossaryEntityModal.tsx
@@ -7,6 +7,7 @@ import { useUpdateParentNodeMutation } from '../../../../graphql/glossary.genera
 import NodeParentSelect from './NodeParentSelect';
 import { useGlossaryEntityData } from '../GlossaryEntityContext';
 import { getGlossaryRootToUpdate, getParentNodeToUpdate, updateGlossarySidebar } from '../../../glossary/utils';
+import { getModalDomContainer } from '../../../../utils/focus';
 
 const StyledItem = styled(Form.Item)`
     margin-bottom: 0;
@@ -68,6 +69,7 @@ function MoveGlossaryEntityModal(props: Props) {
             title="Move"
             visible
             onCancel={onClose}
+            getContainer={getModalDomContainer}
             footer={
                 <>
                     <Button onClick={onClose} type="text">
@@ -92,6 +94,7 @@ function MoveGlossaryEntityModal(props: Props) {
                             selectedParentUrn={selectedParentUrn}
                             setSelectedParentUrn={setSelectedParentUrn}
                             isMoving
+                            autoFocus
                         />
                     </StyledItem>
                 </Form.Item>
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx
index c3bfac35c2ca6d..a508843becfbf8 100644
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx
+++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx
@@ -21,6 +21,7 @@ interface Props {
     selectedParentUrn: string;
     setSelectedParentUrn: (parent: string) => void;
     isMoving?: boolean;
+    autoFocus?: boolean;
 }
 
 function NodeParentSelect(props: Props) {
@@ -56,6 +57,7 @@ function NodeParentSelect(props: Props) {
     return (
         <ClickOutside onClickOutside={() => setIsFocusedOnInput(false)}>
             <Select
+                autoFocus={props?.autoFocus}
                 showSearch
                 allowClear
                 filterOption={false}
diff --git a/smoke-test/tests/cypress/cypress/e2e/glossary/glossary_navigation.js b/smoke-test/tests/cypress/cypress/e2e/glossary/glossary_navigation.js
index c6e9d93f71b8c3..81ca6a57edfbbc 100644
--- a/smoke-test/tests/cypress/cypress/e2e/glossary/glossary_navigation.js
+++ b/smoke-test/tests/cypress/cypress/e2e/glossary/glossary_navigation.js
@@ -30,6 +30,15 @@ describe("glossary sidebar navigation test", () => {
         cy.get('[data-testid="glossary-browser-sidebar"]').contains(glossaryTermGroup).click().wait(3000);
         cy.get('*[class^="GlossaryEntitiesList"]').contains(glossaryTerm).should("be.visible");
 
+        // create glossaryParentGroup
+        cy.goToGlossaryList();
+        cy.clickOptionWithTestId("add-term-group-button");
+        cy.waitTextVisible("Create Term Group");
+        cy.enterTextInTestId("create-glossary-entity-modal-name", glossaryParentGroup);
+        cy.clickOptionWithTestId("glossary-entity-modal-create-button");
+        cy.get('[data-testid="glossary-browser-sidebar"]').contains(glossaryParentGroup).should("be.visible");
+
+
         // Move a term group from the root level to be under a parent term group
         cy.goToGlossaryList();
         cy.clickOptionWithText(glossaryTermGroup);
@@ -55,9 +64,14 @@ describe("glossary sidebar navigation test", () => {
         cy.clickOptionWithText(glossaryTermGroup).wait(3000);
         cy.deleteFromDropdown();
         cy.waitTextVisible("Deleted Term Group!");
+        cy.clickOptionWithText(glossaryParentGroup);
+        cy.deleteFromDropdown();
+        cy.waitTextVisible("Deleted Term Group!");
 
         // Ensure it is no longer in the sidebar navigator
         cy.ensureTextNotPresent(glossaryTerm);
         cy.ensureTextNotPresent(glossaryTermGroup);
+        cy.ensureTextNotPresent(glossaryParentGroup);
+
     });
 });
\ No newline at end of file