diff --git a/frontend/src/components/viewer/EmbedPdfViewer.tsx b/frontend/src/components/viewer/EmbedPdfViewer.tsx
index f20589360..4daa0c554 100644
--- a/frontend/src/components/viewer/EmbedPdfViewer.tsx
+++ b/frontend/src/components/viewer/EmbedPdfViewer.tsx
@@ -13,7 +13,7 @@ import { useSignature } from '../../contexts/SignatureContext';
 import { createStirlingFilesAndStubs } from '../../services/fileStubHelpers';
 import NavigationWarningModal from '../shared/NavigationWarningModal';
 import { isStirlingFile } from '../../types/fileContext';
-import ViewerRightRailButtons from './ViewerRightRailButtons';
+import { useViewerRightRailButtons } from './useViewerRightRailButtons';
 
 export interface EmbedPdfViewerProps {
   sidebarsVisible: boolean;
@@ -37,6 +37,9 @@ const EmbedPdfViewerContent = ({
 
   const { isThumbnailSidebarVisible, toggleThumbnailSidebar, zoomActions, spreadActions, panActions: _panActions, rotationActions: _rotationActions, getScrollState, getZoomState, getSpreadState, getRotationState, isAnnotationMode, isAnnotationsVisible, exportActions } = useViewer();
 
+  // Register viewer right-rail buttons
+  useViewerRightRailButtons();
+
   const scrollState = getScrollState();
   const zoomState = getZoomState();
   const spreadState = getSpreadState();
@@ -253,7 +256,6 @@ const EmbedPdfViewerContent = ({
         overflow: 'hidden',
         contain: 'layout style paint'
       }}>
-      <ViewerRightRailButtons />
       {/* Close Button - Only show in preview mode */}
       {onClose && previewFile && (
         <ActionIcon
diff --git a/frontend/src/components/viewer/ViewerRightRailButtons.tsx b/frontend/src/components/viewer/useViewerRightRailButtons.tsx
similarity index 97%
rename from frontend/src/components/viewer/ViewerRightRailButtons.tsx
rename to frontend/src/components/viewer/useViewerRightRailButtons.tsx
index 83d9af84b..95e03c4c4 100644
--- a/frontend/src/components/viewer/ViewerRightRailButtons.tsx
+++ b/frontend/src/components/viewer/useViewerRightRailButtons.tsx
@@ -8,7 +8,7 @@ import { Tooltip } from '../shared/Tooltip';
 import { SearchInterface } from './SearchInterface';
 import ViewerAnnotationControls from '../shared/rightRail/ViewerAnnotationControls';
 
-const ViewerRightRailButtons = () => {
+export function useViewerRightRailButtons() {
   const { t } = useTranslation();
   const viewer = useViewer();
   const [isPanning, setIsPanning] = useState<boolean>(() => viewer.getPanState()?.isPanning ?? false);
@@ -121,8 +121,4 @@ const ViewerRightRailButtons = () => {
   }, [t, viewer, isPanning]);
 
   useRightRailButtons(viewerButtons);
-
-  return null;
-};
-
-export default ViewerRightRailButtons;
+}