diff --git a/site/src/components/HelpTooltip/HelpTooltip.tsx b/site/src/components/HelpTooltip/HelpTooltip.tsx
index 31e2fe1fb260d..ffa4aa61fe6a3 100644
--- a/site/src/components/HelpTooltip/HelpTooltip.tsx
+++ b/site/src/components/HelpTooltip/HelpTooltip.tsx
@@ -160,7 +160,7 @@ export const HelpTooltipAction: FC<HelpTooltipActionProps> = ({
       onClick={(event) => {
         event.stopPropagation();
         onClick();
-        popover.setIsOpen(false);
+        popover.setOpen(false);
       }}
     >
       <Icon css={styles.actionIcon} />
diff --git a/site/src/components/IconField/IconField.tsx b/site/src/components/IconField/IconField.tsx
index b2bf348d4d532..3690a78983195 100644
--- a/site/src/components/IconField/IconField.tsx
+++ b/site/src/components/IconField/IconField.tsx
@@ -3,7 +3,7 @@ import Button from "@mui/material/Button";
 import InputAdornment from "@mui/material/InputAdornment";
 import TextField, { type TextFieldProps } from "@mui/material/TextField";
 import { visuallyHidden } from "@mui/utils";
-import { type FC, lazy, Suspense } from "react";
+import { type FC, lazy, Suspense, useState } from "react";
 import { DropdownArrow } from "components/DropdownArrow/DropdownArrow";
 import { ExternalImage } from "components/ExternalImage/ExternalImage";
 import { Loader } from "components/Loader/Loader";
@@ -37,6 +37,7 @@ export const IconField: FC<IconFieldProps> = ({
 
   const theme = useTheme();
   const hasIcon = textFieldProps.value && textFieldProps.value !== "";
+  const [open, setOpen] = useState(false);
 
   return (
     <Stack spacing={1}>
@@ -86,31 +87,26 @@ export const IconField: FC<IconFieldProps> = ({
           }
         `}
       />
-      <Popover>
-        {(popover) => (
-          <>
-            <PopoverTrigger>
-              <Button fullWidth endIcon={<DropdownArrow />}>
-                Select emoji
-              </Button>
-            </PopoverTrigger>
-            <PopoverContent
-              id="emoji"
-              css={{ marginTop: 0, ".MuiPaper-root": { width: "auto" } }}
-            >
-              <Suspense fallback={<Loader />}>
-                <EmojiPicker
-                  onEmojiSelect={(emoji) => {
-                    const value =
-                      emoji.src ?? urlFromUnifiedCode(emoji.unified);
-                    onPickEmoji(value);
-                    popover.setIsOpen(false);
-                  }}
-                />
-              </Suspense>
-            </PopoverContent>
-          </>
-        )}
+      <Popover open={open} onOpenChange={setOpen}>
+        <PopoverTrigger>
+          <Button fullWidth endIcon={<DropdownArrow />}>
+            Select emoji
+          </Button>
+        </PopoverTrigger>
+        <PopoverContent
+          id="emoji"
+          css={{ marginTop: 0, ".MuiPaper-root": { width: "auto" } }}
+        >
+          <Suspense fallback={<Loader />}>
+            <EmojiPicker
+              onEmojiSelect={(emoji) => {
+                const value = emoji.src ?? urlFromUnifiedCode(emoji.unified);
+                onPickEmoji(value);
+                setOpen(false);
+              }}
+            />
+          </Suspense>
+        </PopoverContent>
       </Popover>
 
       {/*
diff --git a/site/src/components/Popover/Popover.tsx b/site/src/components/Popover/Popover.tsx
index 1ed4e90a73995..ffb56fd5d7349 100644
--- a/site/src/components/Popover/Popover.tsx
+++ b/site/src/components/Popover/Popover.tsx
@@ -12,7 +12,6 @@ import {
   type ReactNode,
   type RefObject,
   useContext,
-  useEffect,
   useId,
   useRef,
   useState,
@@ -25,14 +24,12 @@ type TriggerRef = RefObject<HTMLElement>;
 type TriggerElement = ReactElement<{
   ref: TriggerRef;
   onClick?: () => void;
-  "aria-haspopup"?: boolean;
-  "aria-owns"?: string | undefined;
 }>;
 
 type PopoverContextValue = {
   id: string;
-  isOpen: boolean;
-  setIsOpen: React.Dispatch<React.SetStateAction<boolean>>;
+  open: boolean;
+  setOpen: (open: boolean) => void;
   triggerRef: TriggerRef;
   mode: TriggerMode;
 };
@@ -41,32 +38,41 @@ const PopoverContext = createContext<PopoverContextValue | undefined>(
   undefined,
 );
 
-export interface PopoverProps {
-  children: ReactNode | ((popover: PopoverContextValue) => ReactNode); // Allows inline usage
+type BasePopoverProps = {
+  children: ReactNode;
   mode?: TriggerMode;
-  isDefaultOpen?: boolean;
-}
+};
 
-export const Popover: FC<PopoverProps> = ({
-  children,
-  mode,
-  isDefaultOpen,
-}) => {
+// By separating controlled and uncontrolled props, we achieve more accurate
+// type inference.
+type UncontrolledPopoverProps = BasePopoverProps & {
+  open?: undefined;
+  onOpenChange?: undefined;
+};
+
+type ControlledPopoverProps = BasePopoverProps & {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+};
+
+export type PopoverProps = UncontrolledPopoverProps | ControlledPopoverProps;
+
+export const Popover: FC<PopoverProps> = (props) => {
   const hookId = useId();
-  const [isOpen, setIsOpen] = useState(isDefaultOpen ?? false);
-  const triggerRef = useRef<HTMLElement>(null);
+  const [uncontrolledOpen, setUncontrolledOpen] = useState(false);
+  const triggerRef: TriggerRef = useRef(null);
 
   const value: PopoverContextValue = {
-    isOpen,
-    setIsOpen,
     triggerRef,
     id: `${hookId}-popover`,
-    mode: mode ?? "click",
+    mode: props.mode ?? "click",
+    open: props.open ?? uncontrolledOpen,
+    setOpen: props.onOpenChange ?? setUncontrolledOpen,
   };
 
   return (
     <PopoverContext.Provider value={value}>
-      {typeof children === "function" ? children(value) : children}
+      {props.children}
     </PopoverContext.Provider>
   );
 };
@@ -82,23 +88,25 @@ export const usePopover = () => {
 };
 
 export const PopoverTrigger = (
-  props: HTMLAttributes<HTMLElement> & { children: TriggerElement },
+  props: HTMLAttributes<HTMLElement> & {
+    children: TriggerElement;
+  },
 ) => {
   const popover = usePopover();
   const { children, ...elementProps } = props;
 
   const clickProps = {
     onClick: () => {
-      popover.setIsOpen((isOpen) => !isOpen);
+      popover.setOpen(true);
     },
   };
 
   const hoverProps = {
     onPointerEnter: () => {
-      popover.setIsOpen(true);
+      popover.setOpen(true);
     },
     onPointerLeave: () => {
-      popover.setIsOpen(false);
+      popover.setOpen(false);
     },
   };
 
@@ -106,7 +114,8 @@ export const PopoverTrigger = (
     ...elementProps,
     ...(popover.mode === "click" ? clickProps : hoverProps),
     "aria-haspopup": true,
-    "aria-owns": popover.isOpen ? popover.id : undefined,
+    "aria-owns": popover.id,
+    "aria-expanded": popover.open,
     ref: popover.triggerRef,
   });
 };
@@ -125,22 +134,8 @@ export const PopoverContent: FC<PopoverContentProps> = ({
   ...popoverProps
 }) => {
   const popover = usePopover();
-  const [isReady, setIsReady] = useState(false);
   const hoverMode = popover.mode === "hover";
 
-  // This is a hack to make sure the popover is not rendered until the trigger
-  // is ready. This is a limitation on MUI that does not support defaultIsOpen
-  // on Popover but we need it to storybook the component.
-  useEffect(() => {
-    if (!isReady && popover.triggerRef.current !== null) {
-      setIsReady(true);
-    }
-  }, [isReady, popover.triggerRef]);
-
-  if (!popover.triggerRef.current) {
-    return null;
-  }
-
   return (
     <MuiPopover
       disablePortal
@@ -161,8 +156,8 @@ export const PopoverContent: FC<PopoverContentProps> = ({
       {...modeProps(popover)}
       {...popoverProps}
       id={popover.id}
-      open={popover.isOpen}
-      onClose={() => popover.setIsOpen(false)}
+      open={popover.open}
+      onClose={() => popover.setOpen(false)}
       anchorEl={popover.triggerRef.current}
     />
   );
@@ -172,10 +167,10 @@ const modeProps = (popover: PopoverContextValue) => {
   if (popover.mode === "hover") {
     return {
       onPointerEnter: () => {
-        popover.setIsOpen(true);
+        popover.setOpen(true);
       },
       onPointerLeave: () => {
-        popover.setIsOpen(false);
+        popover.setOpen(false);
       },
     };
   }
diff --git a/site/src/modules/dashboard/Navbar/DeploymentDropdown.tsx b/site/src/modules/dashboard/Navbar/DeploymentDropdown.tsx
index e54210d831d8e..4a79bc00c1931 100644
--- a/site/src/modules/dashboard/Navbar/DeploymentDropdown.tsx
+++ b/site/src/modules/dashboard/Navbar/DeploymentDropdown.tsx
@@ -87,7 +87,7 @@ const DeploymentDropdownContent: FC<DeploymentDropdownProps> = ({
 }) => {
   const popover = usePopover();
 
-  const onPopoverClose = () => popover.setIsOpen(false);
+  const onPopoverClose = () => popover.setOpen(false);
 
   return (
     <nav>
diff --git a/site/src/modules/dashboard/Navbar/ProxyMenu.stories.tsx b/site/src/modules/dashboard/Navbar/ProxyMenu.stories.tsx
index 185677b62d8df..0780f8eead76e 100644
--- a/site/src/modules/dashboard/Navbar/ProxyMenu.stories.tsx
+++ b/site/src/modules/dashboard/Navbar/ProxyMenu.stories.tsx
@@ -11,6 +11,7 @@ import {
   MockUser,
   MockWorkspaceProxies,
 } from "testHelpers/entities";
+import { withDesktopViewport } from "testHelpers/storybook";
 import { ProxyMenu } from "./ProxyMenu";
 
 const defaultProxyContextValue = {
@@ -36,11 +37,7 @@ const meta: Meta<typeof ProxyMenu> = {
         <Story />
       </AuthProvider>
     ),
-    (Story) => (
-      <div css={{ width: 1200, height: 800 }}>
-        <Story />
-      </div>
-    ),
+    withDesktopViewport,
   ],
   parameters: {
     queries: [
diff --git a/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdown.tsx b/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdown.tsx
index b42858157d142..da5a56d9cd12f 100644
--- a/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdown.tsx
+++ b/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdown.tsx
@@ -1,6 +1,6 @@
 import { css, type Interpolation, type Theme, useTheme } from "@emotion/react";
 import Badge from "@mui/material/Badge";
-import type { FC } from "react";
+import { useState, type FC } from "react";
 import type * as TypesGen from "api/typesGenerated";
 import { DropdownArrow } from "components/DropdownArrow/DropdownArrow";
 import {
@@ -26,48 +26,45 @@ export const UserDropdown: FC<UserDropdownProps> = ({
   onSignOut,
 }) => {
   const theme = useTheme();
+  const [open, setOpen] = useState(false);
 
   return (
-    <Popover>
-      {(popover) => (
-        <>
-          <PopoverTrigger>
-            <button css={styles.button} data-testid="user-dropdown-trigger">
-              <div css={styles.badgeContainer}>
-                <Badge overlap="circular">
-                  <UserAvatar
-                    css={styles.avatar}
-                    username={user.username}
-                    avatarURL={user.avatar_url}
-                  />
-                </Badge>
-                <DropdownArrow
-                  color={theme.experimental.l2.fill.solid}
-                  close={popover.isOpen}
-                />
-              </div>
-            </button>
-          </PopoverTrigger>
-
-          <PopoverContent
-            horizontal="right"
-            css={{
-              ".MuiPaper-root": {
-                minWidth: "auto",
-                width: 260,
-                boxShadow: theme.shadows[6],
-              },
-            }}
-          >
-            <UserDropdownContent
-              user={user}
-              buildInfo={buildInfo}
-              supportLinks={supportLinks}
-              onSignOut={onSignOut}
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger>
+        <button css={styles.button} data-testid="user-dropdown-trigger">
+          <div css={styles.badgeContainer}>
+            <Badge overlap="circular">
+              <UserAvatar
+                css={styles.avatar}
+                username={user.username}
+                avatarURL={user.avatar_url}
+              />
+            </Badge>
+            <DropdownArrow
+              color={theme.experimental.l2.fill.solid}
+              close={open}
             />
-          </PopoverContent>
-        </>
-      )}
+          </div>
+        </button>
+      </PopoverTrigger>
+
+      <PopoverContent
+        horizontal="right"
+        css={{
+          ".MuiPaper-root": {
+            minWidth: "auto",
+            width: 260,
+            boxShadow: theme.shadows[6],
+          },
+        }}
+      >
+        <UserDropdownContent
+          user={user}
+          buildInfo={buildInfo}
+          supportLinks={supportLinks}
+          onSignOut={onSignOut}
+        />
+      </PopoverContent>
     </Popover>
   );
 };
diff --git a/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdownContent.tsx b/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdownContent.tsx
index b8766698d4ca7..b82178b3812fc 100644
--- a/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdownContent.tsx
+++ b/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdownContent.tsx
@@ -43,7 +43,7 @@ export const UserDropdownContent: FC<UserDropdownContentProps> = ({
   const popover = usePopover();
 
   const onPopoverClose = () => {
-    popover.setIsOpen(false);
+    popover.setOpen(false);
   };
 
   const renderMenuIcon = (icon: string): JSX.Element => {
diff --git a/site/src/modules/resources/SSHButton/SSHButton.stories.tsx b/site/src/modules/resources/SSHButton/SSHButton.stories.tsx
index a27e5102746ca..9b4e48759dd51 100644
--- a/site/src/modules/resources/SSHButton/SSHButton.stories.tsx
+++ b/site/src/modules/resources/SSHButton/SSHButton.stories.tsx
@@ -1,5 +1,7 @@
 import type { Meta, StoryObj } from "@storybook/react";
+import { userEvent, within } from "@storybook/test";
 import { MockWorkspace, MockWorkspaceAgent } from "testHelpers/entities";
+import { withDesktopViewport } from "testHelpers/storybook";
 import { SSHButton } from "./SSHButton";
 
 const meta: Meta<typeof SSHButton> = {
@@ -22,7 +24,12 @@ export const Opened: Story = {
   args: {
     workspaceName: MockWorkspace.name,
     agentName: MockWorkspaceAgent.name,
-    isDefaultOpen: true,
     sshPrefix: "coder.",
   },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    const button = canvas.getByRole("button");
+    await userEvent.click(button);
+  },
+  decorators: [withDesktopViewport],
 };
diff --git a/site/src/modules/resources/SSHButton/SSHButton.tsx b/site/src/modules/resources/SSHButton/SSHButton.tsx
index d4b8662705eab..fe70ad05253d2 100644
--- a/site/src/modules/resources/SSHButton/SSHButton.tsx
+++ b/site/src/modules/resources/SSHButton/SSHButton.tsx
@@ -20,20 +20,18 @@ import { docs } from "utils/docs";
 export interface SSHButtonProps {
   workspaceName: string;
   agentName: string;
-  isDefaultOpen?: boolean;
   sshPrefix?: string;
 }
 
 export const SSHButton: FC<SSHButtonProps> = ({
   workspaceName,
   agentName,
-  isDefaultOpen = false,
   sshPrefix,
 }) => {
   const paper = useClassName(classNames.paper, []);
 
   return (
-    <Popover isDefaultOpen={isDefaultOpen}>
+    <Popover>
       <PopoverTrigger>
         <Button
           size="small"
diff --git a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
index bafc2b035bf15..605b66323fa45 100644
--- a/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
+++ b/site/src/modules/workspaces/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx
@@ -56,7 +56,7 @@ export const WorkspaceOutdatedTooltipContent: FC<TooltipProps> = ({
   const popover = usePopover();
   const { data: activeVersion } = useQuery({
     ...templateVersion(latestVersionId),
-    enabled: popover.isOpen,
+    enabled: popover.open,
   });
   const theme = useTheme();
 
diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/DateRange.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/DateRange.tsx
index 65f85d31799a2..357964d8f52b6 100644
--- a/site/src/pages/TemplatePage/TemplateInsightsPage/DateRange.tsx
+++ b/site/src/pages/TemplatePage/TemplateInsightsPage/DateRange.tsx
@@ -49,92 +49,89 @@ export const DateRange: FC<DateRangeProps> = ({ value, onChange }) => {
       key: "selection",
     },
   ]);
+  const [open, setOpen] = useState(false);
 
   return (
-    <Popover>
-      {(popover) => (
-        <>
-          <PopoverTrigger>
-            <Button>
-              <span>{format(value.startDate, "MMM d, Y")}</span>
-              <ArrowRightAltOutlined
-                css={{ width: 16, height: 16, marginLeft: 8, marginRight: 8 }}
-              />
-              <span>{format(value.endDate, "MMM d, Y")}</span>
-            </Button>
-          </PopoverTrigger>
-          <PopoverContent>
-            <DateRangePicker
-              css={styles.wrapper}
-              onChange={(item) => {
-                const range = item.selection;
-                setRanges([range]);
-
-                // When it is the first selection, we don't want to close the popover
-                // We have to do that ourselves because the library doesn't provide a way to do it
-                if (selectionStatusRef.current === "idle") {
-                  selectionStatusRef.current = "selecting";
-                  return;
-                }
-
-                selectionStatusRef.current = "idle";
-                const startDate = range.startDate as Date;
-                const endDate = range.endDate as Date;
-                const now = new Date();
-                onChange({
-                  startDate: startOfDay(startDate),
-                  endDate: isToday(endDate)
-                    ? startOfHour(addHours(now, 1))
-                    : startOfDay(addDays(endDate, 1)),
-                });
-                popover.setIsOpen(false);
-              }}
-              moveRangeOnFirstSelection={false}
-              months={2}
-              ranges={ranges}
-              maxDate={new Date()}
-              direction="horizontal"
-              staticRanges={createStaticRanges([
-                {
-                  label: "Today",
-                  range: () => ({
-                    startDate: new Date(),
-                    endDate: new Date(),
-                  }),
-                },
-                {
-                  label: "Yesterday",
-                  range: () => ({
-                    startDate: subDays(new Date(), 1),
-                    endDate: subDays(new Date(), 1),
-                  }),
-                },
-                {
-                  label: "Last 7 days",
-                  range: () => ({
-                    startDate: subDays(new Date(), 6),
-                    endDate: new Date(),
-                  }),
-                },
-                {
-                  label: "Last 14 days",
-                  range: () => ({
-                    startDate: subDays(new Date(), 13),
-                    endDate: new Date(),
-                  }),
-                },
-                {
-                  label: "Last 30 days",
-                  range: () => ({
-                    startDate: subDays(new Date(), 29),
-                    endDate: new Date(),
-                  }),
-                },
-              ])}
-            />
-          </PopoverContent>
-        </>
-      )}
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger>
+        <Button>
+          <span>{format(value.startDate, "MMM d, Y")}</span>
+          <ArrowRightAltOutlined
+            css={{ width: 16, height: 16, marginLeft: 8, marginRight: 8 }}
+          />
+          <span>{format(value.endDate, "MMM d, Y")}</span>
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent>
+        <DateRangePicker
+          css={styles.wrapper}
+          onChange={(item) => {
+            const range = item.selection;
+            setRanges([range]);
+
+            // When it is the first selection, we don't want to close the popover
+            // We have to do that ourselves because the library doesn't provide a way to do it
+            if (selectionStatusRef.current === "idle") {
+              selectionStatusRef.current = "selecting";
+              return;
+            }
+
+            selectionStatusRef.current = "idle";
+            const startDate = range.startDate as Date;
+            const endDate = range.endDate as Date;
+            const now = new Date();
+            onChange({
+              startDate: startOfDay(startDate),
+              endDate: isToday(endDate)
+                ? startOfHour(addHours(now, 1))
+                : startOfDay(addDays(endDate, 1)),
+            });
+            setOpen(false);
+          }}
+          moveRangeOnFirstSelection={false}
+          months={2}
+          ranges={ranges}
+          maxDate={new Date()}
+          direction="horizontal"
+          staticRanges={createStaticRanges([
+            {
+              label: "Today",
+              range: () => ({
+                startDate: new Date(),
+                endDate: new Date(),
+              }),
+            },
+            {
+              label: "Yesterday",
+              range: () => ({
+                startDate: subDays(new Date(), 1),
+                endDate: subDays(new Date(), 1),
+              }),
+            },
+            {
+              label: "Last 7 days",
+              range: () => ({
+                startDate: subDays(new Date(), 6),
+                endDate: new Date(),
+              }),
+            },
+            {
+              label: "Last 14 days",
+              range: () => ({
+                startDate: subDays(new Date(), 13),
+                endDate: new Date(),
+              }),
+            },
+            {
+              label: "Last 30 days",
+              range: () => ({
+                startDate: subDays(new Date(), 29),
+                endDate: new Date(),
+              }),
+            },
+          ])}
+        />
+      </PopoverContent>
     </Popover>
   );
 };
diff --git a/site/src/pages/UsersPage/UsersTable/EditRolesButton.stories.tsx b/site/src/pages/UsersPage/UsersTable/EditRolesButton.stories.tsx
index 1a7ba3654cd55..34fc8fb9c82fc 100644
--- a/site/src/pages/UsersPage/UsersTable/EditRolesButton.stories.tsx
+++ b/site/src/pages/UsersPage/UsersTable/EditRolesButton.stories.tsx
@@ -1,43 +1,43 @@
 import type { Meta, StoryObj } from "@storybook/react";
+import { userEvent, within } from "@storybook/test";
 import {
   MockOwnerRole,
   MockSiteRoles,
   MockUserAdminRole,
 } from "testHelpers/entities";
+import { withDesktopViewport } from "testHelpers/storybook";
 import { EditRolesButton } from "./EditRolesButton";
 
 const meta: Meta<typeof EditRolesButton> = {
   title: "pages/UsersPage/EditRolesButton",
   component: EditRolesButton,
   args: {
-    isDefaultOpen: true,
+    selectedRoleNames: new Set([MockUserAdminRole.name, MockOwnerRole.name]),
+    roles: MockSiteRoles,
   },
+  decorators: [withDesktopViewport],
 };
 
 export default meta;
 type Story = StoryObj<typeof EditRolesButton>;
 
-const selectedRoleNames = new Set([MockUserAdminRole.name, MockOwnerRole.name]);
+export const Closed: Story = {};
 
 export const Open: Story = {
-  args: {
-    selectedRoleNames,
-    roles: MockSiteRoles,
-  },
-  parameters: {
-    chromatic: { delay: 300 },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    await userEvent.click(canvas.getByRole("button"));
   },
 };
 
 export const Loading: Story = {
   args: {
     isLoading: true,
-    selectedRoleNames,
-    roles: MockSiteRoles,
     userLoginType: "password",
     oidcRoleSync: false,
   },
-  parameters: {
-    chromatic: { delay: 300 },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    await userEvent.click(canvas.getByRole("button"));
   },
 };
diff --git a/site/src/pages/UsersPage/UsersTable/EditRolesButton.tsx b/site/src/pages/UsersPage/UsersTable/EditRolesButton.tsx
index b304bbed01f89..82cc574fb13a1 100644
--- a/site/src/pages/UsersPage/UsersTable/EditRolesButton.tsx
+++ b/site/src/pages/UsersPage/UsersTable/EditRolesButton.tsx
@@ -72,7 +72,6 @@ export interface EditRolesButtonProps {
   roles: readonly SlimRole[];
   selectedRoleNames: Set<string>;
   onChange: (roles: SlimRole["name"][]) => void;
-  isDefaultOpen?: boolean;
   oidcRoleSync: boolean;
   userLoginType: string;
 }
@@ -82,7 +81,6 @@ export const EditRolesButton: FC<EditRolesButtonProps> = ({
   selectedRoleNames,
   onChange,
   isLoading,
-  isDefaultOpen = false,
   userLoginType,
   oidcRoleSync,
 }) => {
@@ -116,7 +114,7 @@ export const EditRolesButton: FC<EditRolesButtonProps> = ({
   }
 
   return (
-    <Popover isDefaultOpen={isDefaultOpen}>
+    <Popover>
       <PopoverTrigger>
         <IconButton
           size="small"
diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/BuildParametersPopover.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/BuildParametersPopover.tsx
index 5916557a1c409..95f78fd10b0e1 100644
--- a/site/src/pages/WorkspacePage/WorkspaceActions/BuildParametersPopover.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceActions/BuildParametersPopover.tsx
@@ -117,7 +117,7 @@ const BuildParametersPopoverContent: FC<BuildParametersPopoverContentProps> = ({
               <Form
                 onSubmit={(buildParameters) => {
                   onSubmit(buildParameters);
-                  popover.setIsOpen(false);
+                  popover.setOpen(false);
                 }}
                 ephemeralParameters={ephemeralParameters}
                 buildParameters={buildParameters.map(
diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/DownloadLogsDialog.stories.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/DownloadLogsDialog.stories.tsx
index ddeaf6fb46634..090963ee5ac37 100644
--- a/site/src/pages/WorkspacePage/WorkspaceActions/DownloadLogsDialog.stories.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceActions/DownloadLogsDialog.stories.tsx
@@ -2,6 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react";
 import { expect, userEvent, fn, waitFor, within } from "@storybook/test";
 import { agentLogsKey, buildLogsKey } from "api/queries/workspaces";
 import { MockWorkspace, MockWorkspaceAgent } from "testHelpers/entities";
+import { withDesktopViewport } from "testHelpers/storybook";
 import { DownloadLogsDialog } from "./DownloadLogsDialog";
 
 const meta: Meta<typeof DownloadLogsDialog> = {
@@ -24,13 +25,7 @@ const meta: Meta<typeof DownloadLogsDialog> = {
       },
     ],
   },
-  decorators: [
-    (Story) => (
-      <div css={{ width: 1200, height: 800 }}>
-        <Story />
-      </div>
-    ),
-  ],
+  decorators: [withDesktopViewport],
 };
 
 export default meta;
diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx
index e4188b7b88041..b42dbd418a04f 100644
--- a/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx
@@ -2,6 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react";
 import { userEvent, within, expect } from "@storybook/test";
 import { buildLogsKey, agentLogsKey } from "api/queries/workspaces";
 import * as Mocks from "testHelpers/entities";
+import { withDesktopViewport } from "testHelpers/storybook";
 import { WorkspaceActions } from "./WorkspaceActions";
 
 const meta: Meta<typeof WorkspaceActions> = {
@@ -10,13 +11,7 @@ const meta: Meta<typeof WorkspaceActions> = {
   args: {
     isUpdating: false,
   },
-  decorators: [
-    (Story) => (
-      <div css={{ width: 1200, height: 800 }}>
-        <Story />
-      </div>
-    ),
-  ],
+  decorators: [withDesktopViewport],
 };
 
 export default meta;
diff --git a/site/src/pages/WorkspacePage/WorkspaceNotifications/Notifications.tsx b/site/src/pages/WorkspacePage/WorkspaceNotifications/Notifications.tsx
index 238477408bed1..6ff7648680950 100644
--- a/site/src/pages/WorkspacePage/WorkspaceNotifications/Notifications.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceNotifications/Notifications.tsx
@@ -70,7 +70,7 @@ const NotificationPill: FC<NotificationsProps> = ({
       icon={icon}
       css={(theme) => ({
         "& svg": { color: theme.roles[severity].outline },
-        borderColor: popover.isOpen ? theme.roles[severity].outline : undefined,
+        borderColor: popover.open ? theme.roles[severity].outline : undefined,
       })}
     >
       {items.length}
diff --git a/site/src/testHelpers/storybook.tsx b/site/src/testHelpers/storybook.tsx
index 77c0305d1aa2b..af1ba691bf826 100644
--- a/site/src/testHelpers/storybook.tsx
+++ b/site/src/testHelpers/storybook.tsx
@@ -78,3 +78,9 @@ export const withWebSocket = (Story: FC, { parameters }: StoryContext) => {
 
   return <Story />;
 };
+
+export const withDesktopViewport = (Story: FC) => (
+  <div style={{ width: 1200, height: 800 }}>
+    <Story />
+  </div>
+);