diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 44d34f094..e68eb4f4c 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -13,6 +13,7 @@ import Navbar from '../components/Navbar';
 import PageWrapper from '../components/PageWrapper';
 import isDev from '../core/blitzkrieg/isDev';
 import { isLocalhost } from '../core/blitzkrieg/isLocalhost';
+import { useFullScreen } from '../hooks/useFullScreen';
 import { useApp } from '../stores/app';
 import { mintTheme } from '../themes/mint';
 
@@ -33,6 +34,7 @@ export default function RootLayout({ children }: RootLayoutProps) {
   const pathname = usePathname();
   const isEmbed = pathname.split('/')[1] === 'embeds';
   const [showDevBuildAlert, setShowDevBuildAlert] = useState(false);
+  const isFullScreen = useFullScreen();
 
   useEffect(() => {
     setShowDevBuildAlert(
@@ -100,7 +102,7 @@ export default function RootLayout({ children }: RootLayoutProps) {
 
           <Flex direction="column">{children}</Flex>
 
-          {!isEmbed && (
+          {!isEmbed && !isFullScreen && (
             <PageWrapper>
               <a
                 target="_blank"
diff --git a/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx b/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
index c60ff229a..64ddf7135 100644
--- a/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
@@ -30,6 +30,7 @@ import {
 import { unionBoundingBox } from '../../../../../../core/blitzkrieg/unionBoundingBox';
 import { useConsumable } from '../../../../../../hooks/useConsumable';
 import { useEquipment } from '../../../../../../hooks/useEquipment';
+import { useFullScreen } from '../../../../../../hooks/useFullScreen';
 import { useProvision } from '../../../../../../hooks/useProvision';
 import { useProvisions } from '../../../../../../hooks/useProvisions';
 import { mutateDuel, useDuel } from '../../../../../../stores/duel';
@@ -43,6 +44,7 @@ export function Characteristics() {
   const { tank, turret, gun, engine, track, shell } = useDuel(
     (state) => state.protagonist!,
   );
+  const isFullScreen = useFullScreen();
   const hasImprovedVentilation = useEquipment(102);
   const provisions = useProvisions();
   const crewMastery = useDuel((state) => state.protagonist!.crewMastery);
@@ -260,6 +262,8 @@ export function Characteristics() {
     });
   }, [hasImprovedVerticalStabilizer]);
 
+  if (isFullScreen) return null;
+
   return (
     <Flex direction="column" gap="8" style={{ width: '100%' }}>
       <Flex direction="column" gap="2">
diff --git a/src/components/ModuleButtons/TankComponentButton.tsx b/src/components/ModuleButtons/TankComponentButton.tsx
index 95efbb659..661ff8349 100644
--- a/src/components/ModuleButtons/TankComponentButton.tsx
+++ b/src/components/ModuleButtons/TankComponentButton.tsx
@@ -65,12 +65,13 @@ export function TankComponentButton({
         />
       )}
 
+      {children}
+
       {discriminator !== undefined && (
         <Text
           size="1"
           style={{
             textShadow: '0 0 4px black',
-            zIndex: 1,
             position: 'absolute',
             top: '50%',
             right: 8,
@@ -81,8 +82,6 @@ export function TankComponentButton({
           {discriminator}
         </Text>
       )}
-
-      {children}
     </Button>
   );
 }