diff --git a/packages/spor-react/src/input/Combobox.tsx b/packages/spor-react/src/input/Combobox.tsx
index 2baff9d12..d2e23f5dd 100644
--- a/packages/spor-react/src/input/Combobox.tsx
+++ b/packages/spor-react/src/input/Combobox.tsx
@@ -113,6 +113,7 @@ export function Combobox<T extends object>({
     <>
       <Input
         {...inputProps}
+        aria-haspopup="listbox"
         ref={inputRef}
         label={label}
         borderBottomLeftRadius={
diff --git a/packages/spor-react/src/input/Popover.tsx b/packages/spor-react/src/input/Popover.tsx
index f7f89f245..5dd7b545c 100644
--- a/packages/spor-react/src/input/Popover.tsx
+++ b/packages/spor-react/src/input/Popover.tsx
@@ -81,18 +81,28 @@ export const Popover = forwardRef<HTMLDivElement, PopoverProps>(
       state
     );
 
-    return (
-      <Overlay>
-        {hasBackdrop && <Box {...underlayProps} position="fixed" inset="0" />}
+    const PopOverBox = () => {
+      return (
         <Box
           {...popoverProps}
           ref={popoverRef}
           minWidth={triggerRef.current?.clientWidth ?? "auto"}
+          marginLeft={-2}
         >
-          <DismissButton onDismiss={state.close} />
+          {!isNonModal && <DismissButton onDismiss={state.close} />}
           {children}
           <DismissButton onDismiss={state.close} />
         </Box>
+      );
+    };
+
+    if (isNonModal) {
+      return <PopOverBox />;
+    }
+    return (
+      <Overlay>
+        {hasBackdrop && <Box {...underlayProps} position="fixed" inset="0" />}
+        <PopOverBox />
       </Overlay>
     );
   }