diff --git a/src/frontend/src/components/inputComponent/components/popover/index.tsx b/src/frontend/src/components/inputComponent/components/popover/index.tsx
index 64b67f143..9f3834a6b 100644
--- a/src/frontend/src/components/inputComponent/components/popover/index.tsx
+++ b/src/frontend/src/components/inputComponent/components/popover/index.tsx
@@ -127,7 +127,7 @@ const CustomInputPopover = ({
               disabled={disabled}
               required={required}
               className={cn(
-                "popover-input truncate pr-4",
+                "popover-input nodrag truncate pr-4",
                 editNode && "px-3",
                 editNode && disabled && "h-fit w-fit",
                 disabled &&
diff --git a/src/frontend/src/components/inputComponent/index.tsx b/src/frontend/src/components/inputComponent/index.tsx
index 917e5f153..a4e86b4cf 100644
--- a/src/frontend/src/components/inputComponent/index.tsx
+++ b/src/frontend/src/components/inputComponent/index.tsx
@@ -179,13 +179,15 @@ export default function InputComponent({
             )}
           >
             <ForwardedIconComponent
-              name={getIconName(
-                disabled!,
-                selectedOption!,
-                optionsIcon,
-                nodeStyle!,
-                isToolMode!,
-              )}
+              name={
+                getIconName(
+                  disabled!,
+                  selectedOption!,
+                  optionsIcon,
+                  nodeStyle!,
+                  isToolMode!,
+                ) || "ChevronsUpDown"
+              }
               className={cn(
                 disabled ? "cursor-grab text-placeholder" : "cursor-pointer",
                 "icon-size",