diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/CustomShellButton.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/CustomShellButton.tsx
index d87108213..13d51c756 100644
--- a/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/CustomShellButton.tsx
+++ b/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/CustomShellButton.tsx
@@ -109,6 +109,8 @@ export function CustomShellButton() {
                   }}
                   onFocus={(event) => event.target.select()}
                   onKeyDown={(event) => {
+                    event.stopPropagation();
+
                     if (event.key === 'Enter') {
                       (event.target as HTMLInputElement).blur();
                     } else if (event.key === 'Escape') {
@@ -136,6 +138,8 @@ export function CustomShellButton() {
                   }}
                   onFocus={(event) => event.target.select()}
                   onKeyDown={(event) => {
+                    event.stopPropagation();
+
                     if (event.key === 'Enter') {
                       (event.target as HTMLInputElement).blur();
                     } else if (event.key === 'Escape') {
diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/index.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/index.tsx
index 8d72c0495..54e3e78a7 100644
--- a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/index.tsx
+++ b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/index.tsx
@@ -161,7 +161,7 @@ export const TankSandbox = forwardRef<HTMLCanvasElement, TankSandboxProps>(
 
     return (
       <Canvas
-        // frameloop={onScreen ? 'demand' : 'never'}
+        frameloop={onScreen ? 'demand' : 'never'}
         gl={{
           clippingPlanes: [],
           localClippingEnabled: true,