diff --git a/cypress/e2e/17-workflow-tags.cy.ts b/cypress/e2e/17-workflow-tags.cy.ts
index 966a506e7b..299c96b41d 100644
--- a/cypress/e2e/17-workflow-tags.cy.ts
+++ b/cypress/e2e/17-workflow-tags.cy.ts
@@ -30,6 +30,7 @@ describe('Workflow tags', () => {
 		}
 		cy.contains('Done').click();
 
+		wf.getters.createTagButton().click();
 		wf.getters.tagsDropdown().click();
 		wf.getters.tagsInDropdown().should('have.length', 5);
 		wf.getters.tagPills().should('have.length', 0); // none attached
@@ -45,7 +46,7 @@ describe('Workflow tags', () => {
 		});
 
 		cy.contains('Done').click();
-		wf.getters.tagsDropdown().click();
+		wf.getters.createTagButton().click();
 		wf.getters.tagsInDropdown().should('have.length', 0); // none stored
 		wf.getters.tagPills().should('have.length', 0); // none attached
 	});
@@ -66,7 +67,7 @@ describe('Workflow tags', () => {
 			.type(' Updated')
 			.type('{enter}');
 		cy.contains('Done').click();
-		wf.getters.tagsDropdown().click();
+		wf.getters.createTagButton().click();
 		wf.getters.tagsInDropdown().should('have.length', 1); // one stored
 		wf.getters.tagsInDropdown().contains('Updated').should('exist');
 		wf.getters.tagPills().should('have.length', 0); // none attached
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index 72aca5977a..afe2a2081a 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -13,9 +13,9 @@ export class WorkflowPage extends BasePage {
 		workflowTagsContainer: () => cy.getByTestId('workflow-tags-container'),
 		workflowTagsInput: () =>
 			this.getters.workflowTagsContainer().then(($el) => cy.wrap($el.find('input').first())),
-		tagPills: () => cy.get('[data-test-id="workflow-tags-container"] span.tags > span'),
+		tagPills: () => cy.get('[data-test-id="workflow-tags-container"] span.el-tag'),
 		nthTagPill: (n: number) =>
-			cy.get(`[data-test-id="workflow-tags-container"] span.tags > span:nth-child(${n})`),
+			cy.get(`[data-test-id="workflow-tags-container"] span.el-tag:nth-child(${n})`),
 		tagsDropdown: () => cy.getByTestId('workflow-tags-dropdown'),
 		tagsInDropdown: () => getVisibleSelect().find('li').filter('.tag'),
 		createTagButton: () => cy.getByTestId('new-tag-link'),
@@ -214,7 +214,7 @@ export class WorkflowPage extends BasePage {
 				this.getters.workflowTagsInput().type(tag);
 				this.getters.workflowTagsInput().type('{enter}');
 			});
-			cy.get('body').click(0, 0);
+			cy.realPress('Tab')
 			// For a brief moment the Element UI tag component shows the tags as(+X) string
 			// so we need to wait for it to disappear
 			this.getters.workflowTagsContainer().should('not.contain', `+${tags.length}`);
diff --git a/packages/design-system/src/css/drawer.scss b/packages/design-system/src/css/drawer.scss
index 1ef1ba76f3..cc2dbc7266 100644
--- a/packages/design-system/src/css/drawer.scss
+++ b/packages/design-system/src/css/drawer.scss
@@ -68,7 +68,6 @@ $directions: rtl, ltr, ttb, btt;
   &__body {
     flex: 1;
 		padding: 0;
-		
     overflow: auto;
     & > * {
       box-sizing: border-box;
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index 298cbf5c77..70002cd55b 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -209,6 +209,7 @@ export default defineComponent({
 			if (manage) {
 				filter.value = '';
 				uiStore.openModal(TAGS_MANAGER_MODAL_KEY);
+				emit('blur');
 			} else if (create) {
 				void onCreate();
 			} else {