diff --git a/client/src/components/Button.tsx b/client/src/components/Button.tsx
index a89726c..4e0d5ac 100644
--- a/client/src/components/Button.tsx
+++ b/client/src/components/Button.tsx
@@ -108,6 +108,7 @@
 
 export type ExpandableButtonProps = IconButtonProps & {
   isVertical?: boolean;
+  expandMenuOnClick?: boolean;
   Icon?: ComponentType<SvgIconProps>;
   expandMenuOptions?: (ExpandMenuOption | ExpandMenuRadioOption)[];
   IconButtonComp?: ComponentType<IconButtonProps>;
@@ -116,6 +117,7 @@
 export const ExpandableButton = ({
   isVertical,
   Icon,
+  expandMenuOnClick,
   expandMenuOptions = undefined,
   IconButtonComp = IconButton,
   ...props
@@ -194,7 +196,18 @@
             />
           </IconButton>
         )}
-        <IconButtonComp {...props}>{Icon && <Icon />}</IconButtonComp>
+        <IconButtonComp
+          onClick={
+            expandMenuOnClick
+              ? (event) => {
+                  setAnchorEl(event.currentTarget);
+                }
+              : undefined
+          }
+          {...props}
+        >
+          {Icon && <Icon />}
+        </IconButtonComp>
       </Box>
     </>
   );
diff --git a/client/src/components/CallButtons.tsx b/client/src/components/CallButtons.tsx
index 2ecc4fc..d1beab8 100644
--- a/client/src/components/CallButtons.tsx
+++ b/client/src/components/CallButtons.tsx
@@ -152,6 +152,7 @@
   return (
     <CallButton
       aria-label="screen share"
+      expandMenuOnClick
       Icon={ScreenShareArrowIcon}
       expandMenuOptions={[
         {
@@ -206,17 +207,13 @@
 
 export const CallingVolumeButton = (props: ExpandableButtonProps) => {
   const options = useMediaDeviceExpandMenuOptions('audiooutput');
-  const { remoteVideoRef } = useContext(CallContext);
-
-  // Audio out options are only available on chrome and other browsers that support `setSinkId`
-  // https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/setSinkId#browser_compatibility
-  const hasSetSinkId = remoteVideoRef.current?.setSinkId != null;
 
   return (
     <CallButton
       aria-label="volume options"
+      expandMenuOnClick
       Icon={VolumeIcon}
-      expandMenuOptions={hasSetSinkId ? options : undefined}
+      expandMenuOptions={options}
       {...props}
     />
   );