diff --git a/cypress-tests/cypress/e2e/happyPath/workflows/eeTestcases/workflowfeatures.cy.js b/cypress-tests/cypress/e2e/happyPath/workflows/eeTestcases/workflowfeatures.cy.js
index 8a25065c67..26f9b0feb7 100644
--- a/cypress-tests/cypress/e2e/happyPath/workflows/eeTestcases/workflowfeatures.cy.js
+++ b/cypress-tests/cypress/e2e/happyPath/workflows/eeTestcases/workflowfeatures.cy.js
@@ -75,7 +75,7 @@ describe("Workflows features", () => {
   });
 
   // Need to run after bug fixes
-  it.only("Creating workflow inside Workflow and validating execution", () => {
+  it("Creating workflow inside Workflow and validating execution", () => {
     cy.createWorkflowApp(data.childWFName);
     enterJsonInputInStartNode();
     cy.connectDataSourceNode(workflowsText.runjsNodeLabel);
diff --git a/frontend/src/AppBuilder/QueryManager/QueryEditors/Workflows.jsx b/frontend/src/AppBuilder/QueryManager/QueryEditors/Workflows.jsx
index 0ab4cce519..deadce634a 100644
--- a/frontend/src/AppBuilder/QueryManager/QueryEditors/Workflows.jsx
+++ b/frontend/src/AppBuilder/QueryManager/QueryEditors/Workflows.jsx
@@ -52,6 +52,7 @@ export function Workflows({ options, optionsChanged, currentState }) {
   return (
     <>
       <label className="mb-1">Workflow</label>
+      <div data-cy="workflow-dropdown"></div>
       <Select
         options={workflowOptions}
         value={options.workflowId ?? {}}
@@ -60,7 +61,6 @@ export function Workflows({ options, optionsChanged, currentState }) {
           optionsChanged({ workflowId });
         }}
         placeholder="Select workflow"
-        data-cy="workflow-dropdown"
         height="32px"
         useMenuPortal={true}
         closeMenuOnSelect={true}
diff --git a/frontend/src/_ui/Select/SelectComponent.jsx b/frontend/src/_ui/Select/SelectComponent.jsx
index 1f1e1b55e4..d6f23fa4cb 100644
--- a/frontend/src/_ui/Select/SelectComponent.jsx
+++ b/frontend/src/_ui/Select/SelectComponent.jsx
@@ -57,28 +57,26 @@ export const SelectComponent = ({ options = [], value, onChange, closeMenuOnSele
   };
 
   return (
-    <div data-cy={restProps['data-cy']}>
-      <Select
-        {...restProps}
-        ref={selectRef}
-        selectRef={selectRef} // Exposed ref for custom components if needed
-        isLoading={isLoading}
-        isDisabled={isDisabled || isLoading}
-        options={selectOptions}
-        value={currentValue}
-        isSearchable={hasSearch}
-        onChange={handleOnChange}
-        placeholder={placeholder}
-        styles={customStyles}
-        openMenuOnFocus={openMenuOnFocus}
-        formatOptionLabel={(option) => renderCustomOption(option)}
-        menuPlacement={menuPlacement}
-        maxMenuHeight={maxMenuHeight}
-        menuPortalTarget={useMenuPortal ? document.body : menuPortalTarget}
-        closeMenuOnSelect={closeMenuOnSelect ?? true}
-        classNamePrefix={`${customClassPrefix} ${isDarkMode && 'dark-theme'} ${'react-select'}`}
-        data-cy={restProps['data-cy']}
-      />
-    </div>
+    <Select
+      {...restProps}
+      ref={selectRef}
+      selectRef={selectRef}
+      isLoading={isLoading}
+      isDisabled={isDisabled || isLoading}
+      options={selectOptions}
+      value={currentValue}
+      isSearchable={hasSearch}
+      onChange={handleOnChange}
+      placeholder={placeholder}
+      styles={customStyles}
+      openMenuOnFocus={openMenuOnFocus}
+      formatOptionLabel={(option) => renderCustomOption(option)}
+      menuPlacement={menuPlacement}
+      maxMenuHeight={maxMenuHeight}
+      menuPortalTarget={useMenuPortal ? document.body : menuPortalTarget}
+      closeMenuOnSelect={closeMenuOnSelect ?? true}
+      classNamePrefix={`${customClassPrefix} ${isDarkMode && 'dark-theme'} ${'react-select'}`}
+      data-cy={restProps['data-cy']}
+    />
   );
 };