diff --git a/src/frontend/src/components/GlobalVariableModal/GlobalVariableModal.tsx b/src/frontend/src/components/GlobalVariableModal/GlobalVariableModal.tsx
index 116e9d095..bda803f07 100644
--- a/src/frontend/src/components/GlobalVariableModal/GlobalVariableModal.tsx
+++ b/src/frontend/src/components/GlobalVariableModal/GlobalVariableModal.tsx
@@ -14,6 +14,13 @@ import ForwardedIconComponent from "../genericIconComponent";
 import InputComponent from "../inputComponent";
 import { Input } from "../ui/input";
 import { Label } from "../ui/label";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "../ui/select";
 import { Textarea } from "../ui/textarea";
 import sortByName from "./utils/sort-by-name";
 
@@ -155,17 +162,28 @@ export default function GlobalVariableModal({
             placeholder="Insert a name for the variable..."
           ></Input>
           <Label>Type (optional)</Label>
-          <InputComponent
-            disabled={initialData?.type !== undefined}
-            setSelectedOption={(e) => {
-              setType(e);
-            }}
-            selectedOption={type}
-            password={false}
-            options={["Generic", "Credential"]}
-            placeholder="Choose a type for the variable..."
-            id={"type-global-variables"}
-          ></InputComponent>
+
+          <Select
+            disabled={disabled}
+            onValueChange={setType}
+            value={type}
+            defaultValue={type}
+          >
+            <SelectTrigger
+              className="h-full w-full"
+              data-testid="select-type-global-variables"
+            >
+              <SelectValue placeholder="Choose a type for the variable..." />
+            </SelectTrigger>
+            <SelectContent id="type-global-variables">
+              {["Generic", "Credential"].map((option) => (
+                <SelectItem key={option} value={option}>
+                  {option}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+
           <Label>Value</Label>
           {type === "Credential" ? (
             <InputComponent
diff --git a/src/frontend/tests/core/features/globalVariables.spec.ts b/src/frontend/tests/core/features/globalVariables.spec.ts
index f37a25d25..2ac2e318f 100644
--- a/src/frontend/tests/core/features/globalVariables.spec.ts
+++ b/src/frontend/tests/core/features/globalVariables.spec.ts
@@ -63,7 +63,7 @@ test("user must be able to save or delete a global variable", async ({
   await page
     .getByPlaceholder("Insert a name for the variable...")
     .fill(genericName);
-  await page.getByText("Generic", { exact: true }).isVisible();
+  await page.getByText("Generic", { exact: true }).first().isVisible();
   await page
     .getByPlaceholder("Insert a value for the variable...")
     .fill("This is a test of generic variable value");
@@ -75,11 +75,8 @@ test("user must be able to save or delete a global variable", async ({
   await page
     .getByPlaceholder("Insert a name for the variable...")
     .fill(credentialName);
-  await page
-    .getByTestId("popover-anchor-type-global-variables")
-    .first()
-    .click();
-  await page.getByText("Credential", { exact: true }).click();
+  await page.getByTestId("select-type-global-variables").first().click();
+  await page.getByText("Credential", { exact: true }).last().click();
   await page
     .getByPlaceholder("Insert a value for the variable...")
     .fill("This is a test of credential variable value");
diff --git a/src/frontend/tests/extended/features/userSettings.spec.ts b/src/frontend/tests/extended/features/userSettings.spec.ts
index b4240ad3f..5d5226db1 100644
--- a/src/frontend/tests/extended/features/userSettings.spec.ts
+++ b/src/frontend/tests/extended/features/userSettings.spec.ts
@@ -35,15 +35,7 @@ test("should interact with global variables", async ({ page }) => {
   await page
     .getByPlaceholder("Insert a name for the variable...")
     .fill(randomName);
-  await page.getByTestId("anchor-popover-anchor-type-global-variables").click();
-  await page.getByPlaceholder("Search options...").fill("Generic");
-  await page.waitForTimeout(1000);
-  await page.getByText("Generic", { exact: true }).last().isVisible();
-  await page.getByText("Generic", { exact: true }).last().click();
-
-  await page.getByTestId("popover-anchor-type-global-variables").click();
-  await page.waitForTimeout(1000);
-  await page.getByPlaceholder("Search options...").fill("Generic");
+  await page.getByTestId("select-type-global-variables").first().click();
   await page.getByText("Generic", { exact: true }).last().isVisible();
   await page.getByText("Generic", { exact: true }).last().click();
 
@@ -108,18 +100,6 @@ test("should interact with global variables", async ({ page }) => {
 
   await page.waitForTimeout(2000);
 
-  // const focusElementsOnBoard = async ({ page }) => {
-  //   await page.waitForSelector(
-  //     '[aria-label="Press Space to toggle all rows selection (unchecked)"]',
-  //     { timeout: 30000, state: "visible" },
-  //   );
-  //   const focusElements = await page
-  //     .getByLabel("Press Space to toggle all rows selection (unchecked)")
-  //     .first();
-  //   await focusElements.click();
-  // };
-  // await focusElementsOnBoard({ page });
-
   await page.locator(".ag-checkbox-input").first().click();
   await page.getByTestId("icon-Trash2").click();
   await page.getByText("No data available").isVisible();