diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
index 87777ca79..f8faab81c 100644
--- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
@@ -586,13 +586,14 @@ export default function ParameterComponent({
                     optionsIcon="Globe"
                     optionsButton={
                       <AddNewVariableButton>
-                        <CommandItem>
+                        <CommandItem value="doNotFilter-addNewVariable">
                           <IconComponent
                             name="Plus"
                             className={cn("mr-2 h-4 w-4 text-primary")}
                             aria-hidden="true"
                           />
-                          Add New Variable
+                          <span>Add New Variable</span>
+                          
                         </CommandItem>
                       </AddNewVariableButton>
                     }
diff --git a/src/frontend/src/components/inputComponent/index.tsx b/src/frontend/src/components/inputComponent/index.tsx
index 8cb5080d1..a0581eab3 100644
--- a/src/frontend/src/components/inputComponent/index.tsx
+++ b/src/frontend/src/components/inputComponent/index.tsx
@@ -136,10 +136,15 @@ export default function InputComponent({
               side="bottom"
               align="center"
             >
-              <Command>
+              <Command
+                filter={(value, search) => {
+                  if (value.includes(search) || value.includes("doNotFilter-"))
+                    return 1; // ensures items arent filtered
+                  return 0;
+                }}
+              >
                 <CommandInput placeholder={optionsPlaceholder} />
                 <CommandList>
-                  <CommandEmpty>No results found.</CommandEmpty>
                   <CommandGroup defaultChecked={false}>
                     {options.map((option, id) => (
                       <CommandItem