diff --git a/client/src/components/viewers/controls/FileControlsFullscreen.vue b/client/src/components/viewers/controls/FileControlsFullscreen.vue
new file mode 100644
index 00000000000..6c464dab89f
--- /dev/null
+++ b/client/src/components/viewers/controls/FileControlsFullscreen.vue
@@ -0,0 +1,14 @@
+<!-- Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS -->
+
+<template>
+  <file-controls-group>
+    <file-controls-button :icon="scan" />
+  </file-controls-group>
+</template>
+
+<script setup lang="ts">
+import { scan } from 'ionicons/icons';
+import { FileControlsButton, FileControlsGroup } from '@/components/viewers';
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/client/src/components/viewers/index.ts b/client/src/components/viewers/index.ts
index a38b3657d65..4851d83affc 100644
--- a/client/src/components/viewers/index.ts
+++ b/client/src/components/viewers/index.ts
@@ -2,9 +2,18 @@
 
 import FileControls from '@/components/viewers/controls/FileControls.vue';
 import FileControlsButton from '@/components/viewers/controls/FileControlsButton.vue';
+import FileControlsFullscreen from '@/components/viewers/controls/FileControlsFullscreen.vue';
 import FileControlsGroup from '@/components/viewers/controls/FileControlsGroup.vue';
 import FileControlsInput from '@/components/viewers/controls/FileControlsInput.vue';
 import FileControlsPagination from '@/components/viewers/controls/FileControlsPagination.vue';
 import FileControlsZoom from '@/components/viewers/controls/FileControlsZoom.vue';
 
-export { FileControls, FileControlsButton, FileControlsGroup, FileControlsInput, FileControlsPagination, FileControlsZoom };
+export {
+  FileControls,
+  FileControlsButton,
+  FileControlsFullscreen,
+  FileControlsGroup,
+  FileControlsInput,
+  FileControlsPagination,
+  FileControlsZoom,
+};
diff --git a/client/src/views/viewers/AudioViewer.vue b/client/src/views/viewers/AudioViewer.vue
index 5f5a7906042..78c3ae832a8 100644
--- a/client/src/views/viewers/AudioViewer.vue
+++ b/client/src/views/viewers/AudioViewer.vue
@@ -17,19 +17,20 @@
       />
     </template>
     <!-- Disabled till we add an illustration in the viewer -->
-    <!-- <template #controls>
+    <template #controls>
       <file-controls>
-        <file-controls-button
+        <!-- <file-controls-button
           :class="{'flip-horizontal-ion-icon': ended}"
           :icon="getPlaybackIcon()"
           @click="togglePlayback"
-        />
-        <file-controls-button
+        /> -->
+        <!-- <file-controls-button
           :icon="getVolumeIcon()"
           @click="toggleVolume"
-        />
+        /> -->
+        <file-controls-fullscreen @click="toggleFullScreen" />
       </file-controls>
-    </template> -->
+    </template>
   </file-viewer-wrapper>
 </template>
 
@@ -38,6 +39,7 @@
 import { onMounted, ref } from 'vue';
 import { FileViewerWrapper } from '@/views/viewers';
 import { FileContentInfo } from '@/views/viewers/utils';
+import { FileControls, FileControlsFullscreen } from '@/components/viewers';
 
 const props = defineProps<{
   contentInfo: FileContentInfo;
@@ -95,6 +97,10 @@ function updateMediaData(event: Event): void {
 //       return pause;
 //   }
 // }
+
+function toggleFullScreen(): void {
+  audioElement.value?.requestFullscreen();
+}
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/client/src/views/viewers/DocumentViewer.vue b/client/src/views/viewers/DocumentViewer.vue
index 894dadc390a..48c822dbd65 100644
--- a/client/src/views/viewers/DocumentViewer.vue
+++ b/client/src/views/viewers/DocumentViewer.vue
@@ -5,11 +5,17 @@
     <template #viewer>
       <ms-spinner v-show="loading" />
       <div
+        ref="document"
         v-show="!loading"
         class="document-content"
         v-html="htmlContent"
       />
     </template>
+    <template #controls>
+      <file-controls>
+        <file-controls-fullscreen @click="toggleFullScreen" />
+      </file-controls>
+    </template>
   </file-viewer-wrapper>
 </template>
 
@@ -17,6 +23,7 @@
 import { ref, onMounted } from 'vue';
 import { FileViewerWrapper } from '@/views/viewers';
 import { FileContentInfo } from '@/views/viewers/utils';
+import { FileControls, FileControlsFullscreen } from '@/components/viewers';
 import mammoth from 'mammoth';
 import { MsSpinner } from 'megashark-lib';
 
@@ -26,6 +33,7 @@ const props = defineProps<{
 
 const loading = ref(true);
 const htmlContent = ref('');
+const document = ref();
 
 onMounted(async () => {
   loading.value = true;
@@ -33,6 +41,10 @@ onMounted(async () => {
   htmlContent.value = result.value;
   loading.value = false;
 });
+
+function toggleFullScreen(): void {
+  document.value?.requestFullscreen();
+}
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/client/src/views/viewers/ImageViewer.vue b/client/src/views/viewers/ImageViewer.vue
index 72f9766c327..ad245f35714 100644
--- a/client/src/views/viewers/ImageViewer.vue
+++ b/client/src/views/viewers/ImageViewer.vue
@@ -5,6 +5,7 @@
     <template #viewer>
       <img
         v-if="src.length"
+        ref="imgElement"
         :src="src"
       />
     </template>
@@ -14,6 +15,7 @@
           @change="onChange"
           ref="zoomControl"
         />
+        <file-controls-fullscreen @click="toggleFullScreen" />
       </file-controls>
     </template>
   </file-viewer-wrapper>
@@ -21,7 +23,7 @@
 
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
-import { FileControls, FileControlsZoom } from '@/components/viewers';
+import { FileControls, FileControlsFullscreen, FileControlsZoom } from '@/components/viewers';
 import { FileViewerWrapper } from '@/views/viewers';
 import { FileContentInfo } from '@/views/viewers/utils';
 
@@ -32,6 +34,7 @@ const props = defineProps<{
 const src = ref('');
 const zoomControl = ref();
 const zoomLevel = ref(1);
+const imgElement = ref();
 
 onMounted(async () => {
   src.value = URL.createObjectURL(new Blob([props.contentInfo.data], { type: props.contentInfo.mimeType }));
@@ -41,6 +44,10 @@ onMounted(async () => {
 function onChange(value: number): void {
   zoomLevel.value = value / 100;
 }
+
+function toggleFullScreen(): void {
+  imgElement.value?.requestFullscreen();
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/client/src/views/viewers/PdfViewer.vue b/client/src/views/viewers/PdfViewer.vue
index a13d51c641b..242fc71eb20 100644
--- a/client/src/views/viewers/PdfViewer.vue
+++ b/client/src/views/viewers/PdfViewer.vue
@@ -27,6 +27,7 @@
           @change="loadPage"
           ref="pagination"
         />
+        <file-controls-fullscreen @click="toggleFullScreen" />
       </file-controls>
     </template>
   </file-viewer-wrapper>
@@ -36,7 +37,7 @@
 import { inject, onMounted, ref, Ref, shallowRef } from 'vue';
 import { FileContentInfo } from '@/views/viewers/utils';
 import { FileViewerWrapper } from '@/views/viewers';
-import { FileControls, FileControlsPagination, FileControlsZoom } from '@/components/viewers';
+import { FileControls, FileControlsPagination, FileControlsFullscreen, FileControlsZoom } from '@/components/viewers';
 import { I18n, MsSpinner, Translatable } from 'megashark-lib';
 import * as pdfjs from 'pdfjs-dist';
 import { Information, InformationLevel, InformationManager, InformationManagerKey, PresentationMode } from '@/services/informationManager';
@@ -121,6 +122,10 @@ async function loadPage(pageIndex: number): Promise<void> {
 
   loading.value = false;
 }
+
+function toggleFullScreen(): void {
+  canvas.value?.requestFullscreen();
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/client/src/views/viewers/SpreadsheetViewer.vue b/client/src/views/viewers/SpreadsheetViewer.vue
index 04f50a0d59d..aff2dde44ab 100644
--- a/client/src/views/viewers/SpreadsheetViewer.vue
+++ b/client/src/views/viewers/SpreadsheetViewer.vue
@@ -5,6 +5,7 @@
     <template #viewer>
       <ms-spinner v-show="loading" />
       <div
+        ref="spreadsheet"
         v-show="!loading"
         class="spreadsheet-content"
         v-html="htmlContent"
@@ -18,6 +19,7 @@
           @click="action.handler"
           :label="action.text"
         />
+        <file-controls-fullscreen @click="toggleFullScreen" />
       </file-controls>
     </template>
   </file-viewer-wrapper>
@@ -27,7 +29,7 @@
 import { MsSpinner, I18n, Translatable } from 'megashark-lib';
 import { onBeforeMount, onMounted, Ref, ref } from 'vue';
 import XLSX from 'xlsx';
-import { FileControls, FileControlsButton } from '@/components/viewers';
+import { FileControls, FileControlsButton, FileControlsFullscreen } from '@/components/viewers';
 import { FileViewerWrapper } from '@/views/viewers';
 import { FileContentInfo } from '@/views/viewers/utils';
 
@@ -42,6 +44,7 @@ const currentPage = ref('');
 const loading = ref(true);
 let worker: Worker | null = null;
 const actions: Ref<Array<{ icon?: string; text?: Translatable; handler: () => void }>> = ref([]);
+const spreadsheet = ref();
 
 onMounted(async () => {
   workbook = XLSX.read(props.contentInfo.data, { type: 'array' });
@@ -83,6 +86,10 @@ async function switchToPage(page: string): Promise<void> {
   };
   worker.postMessage(ws);
 }
+
+function toggleFullScreen(): void {
+  spreadsheet.value.requestFullscreen();
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/client/src/views/viewers/TextViewer.vue b/client/src/views/viewers/TextViewer.vue
index 66021283816..7a0443ba978 100644
--- a/client/src/views/viewers/TextViewer.vue
+++ b/client/src/views/viewers/TextViewer.vue
@@ -1,17 +1,27 @@
 <!-- Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS -->
 
 <template>
-  <div
-    ref="container"
-    class="text-container"
-  />
+  <file-viewer-wrapper>
+    <template #viewer>
+      <div
+        ref="container"
+        class="text-container"
+      />
+    </template>
+    <template #controls>
+      <file-controls>
+        <file-controls-fullscreen @click="toggleFullScreen" />
+      </file-controls>
+    </template>
+  </file-viewer-wrapper>
 </template>
 
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
 import * as monaco from 'monaco-editor';
 import { FileContentInfo } from '@/views/viewers/utils';
-
+import { FileViewerWrapper } from '@/views/viewers';
+import { FileControls, FileControlsFullscreen } from '@/components/viewers';
 const props = defineProps<{
   contentInfo: FileContentInfo;
 }>();
@@ -37,6 +47,10 @@ function getLanguage(): string | undefined {
   ]);
   return langs.get(props.contentInfo.extension);
 }
+
+function toggleFullScreen(): void {
+  container.value?.requestFullscreen();
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/client/src/views/viewers/VideoViewer.vue b/client/src/views/viewers/VideoViewer.vue
index 2e394566180..70f7249d12c 100644
--- a/client/src/views/viewers/VideoViewer.vue
+++ b/client/src/views/viewers/VideoViewer.vue
@@ -31,20 +31,17 @@
           :icon="getVolumeIcon()"
           @click="toggleVolume"
         />
-        <file-controls-button
-          :icon="scan"
-          @click="toggleFullScreen"
-        />
+        <file-controls-fullscreen @click="toggleFullScreen" />
       </file-controls>
     </template>
   </file-viewer-wrapper>
 </template>
 
 <script setup lang="ts">
-import { refresh, play, pause, volumeHigh, volumeLow, volumeMedium, volumeMute, scan } from 'ionicons/icons';
+import { refresh, play, pause, volumeHigh, volumeLow, volumeMedium, volumeMute } from 'ionicons/icons';
 import { onMounted, ref } from 'vue';
 import { FileContentInfo } from '@/views/viewers/utils';
-import { FileControls, FileControlsButton } from '@/components/viewers';
+import { FileControls, FileControlsButton, FileControlsFullscreen } from '@/components/viewers';
 import { FileViewerWrapper } from '@/views/viewers';
 
 const props = defineProps<{