diff --git a/src/app/components/elements/PageMetadata.tsx b/src/app/components/elements/PageMetadata.tsx
index 8e516238e1..d789bc76ce 100644
--- a/src/app/components/elements/PageMetadata.tsx
+++ b/src/app/components/elements/PageMetadata.tsx
@@ -50,7 +50,7 @@ interface ActionButtonsProps extends React.HTMLAttributes<HTMLDivElement> {
 export const ActionButtons = ({location, isQuestion, helpModalId, doc, ...rest}: ActionButtonsProps) => {
     const deviceSize = useDeviceSize();
 
-    const anyActionButtonShown = isPhy && helpModalId || above['sm'](deviceSize) || doc?.id;
+    const anyActionButtonShown = isPhy && helpModalId || (above['sm'](deviceSize) && (doc || isPhy)) || doc?.id;
 
     return anyActionButtonShown && <div {...rest} className={classNames("d-flex no-print gap-2", rest.className)}>
         {isPhy && isQuestion && <FeatureFlagWrapper flag={FeatureFlag.ENABLE_SCI_BOOKMARKS}>
@@ -59,7 +59,7 @@ export const ActionButtons = ({location, isQuestion, helpModalId, doc, ...rest}:
         }
         {isPhy && helpModalId && <HelpButton modalId={helpModalId} />}
         {above['sm'](deviceSize) && <>
-            <ShareLink linkUrl={location.pathname + location.hash} clickAwayClose />
+            {(doc || isPhy) && <ShareLink linkUrl={location.pathname + location.hash} clickAwayClose />}
             {doc && <PrintButton questionPage={isQuestion} />} {/* don't show print for internal (non content-driven) pages */}
         </>}
         {doc?.id && <ReportButton pageId={doc.id} />}
diff --git a/src/app/components/elements/layout/PageContainer.tsx b/src/app/components/elements/layout/PageContainer.tsx
index 9b0bfe9b3a..032412da42 100644
--- a/src/app/components/elements/layout/PageContainer.tsx
+++ b/src/app/components/elements/layout/PageContainer.tsx
@@ -47,7 +47,7 @@ export const PageContainer = (props: PageContainerProps) => {
         <SidebarLayout className="g-md-0" id={id} show={!!sidebar}>
             {sidebar}
             <MainContent className="overflow-x-auto">
-                <Container fluid {...rest} className={classNames("my-ada-container mw-1600 px-md-4 px-lg-6 mb-2", rest.className)}>
+                <Container fluid {...rest} className={classNames("my-ada-container overflow-x-auto mw-1600 px-md-4 px-lg-6 mb-2", rest.className)}>
                     {pageTitle}
                     {children}
                 </Container>