diff --git a/src/components/gameboy.tsx b/src/components/gameboy.tsx
index 47d8e060a..e7bbe9309 100644
--- a/src/components/gameboy.tsx
+++ b/src/components/gameboy.tsx
@@ -1,14 +1,19 @@
 // @ts-ignore No types available
 import { WasmBoy } from '@soapbox.pub/wasmboy';
+import clsx from 'clsx';
 import React, { useCallback, useEffect, useRef } from 'react';
 
-interface IGameboy extends React.CanvasHTMLAttributes<HTMLCanvasElement> {
+interface IGameboy extends Pick<React.CanvasHTMLAttributes<HTMLCanvasElement>, 'onFocus' | 'onBlur'> {
+  /** Classname of the outer `<div>`. */
+  className?: string;
   /** URL to the ROM. */
   src: string;
+  /** Aspect ratio of the canvas. */
+  aspect?: 'normal' | 'stretched';
 }
 
 /** Component to display a playable Gameboy emulator. */
-const Gameboy: React.FC<IGameboy> = ({ src, onFocus, onBlur, ...rest }) => {
+const Gameboy: React.FC<IGameboy> = ({ className, src, aspect = 'normal', onFocus, onBlur, ...rest }) => {
   const canvas = useRef<HTMLCanvasElement>(null);
 
   async function init() {
@@ -41,13 +46,19 @@ const Gameboy: React.FC<IGameboy> = ({ src, onFocus, onBlur, ...rest }) => {
   }, []);
 
   return (
-    <canvas
-      ref={canvas}
-      tabIndex={0}
-      onFocus={onFocus ?? handleFocus}
-      onBlur={onBlur ?? handleBlur}
-      {...rest}
-    />
+    <div className={className}>
+      <canvas
+        ref={canvas}
+        tabIndex={0}
+        className={clsx('h-full w-full bg-black ', {
+          'object-contain': aspect === 'normal',
+          'object-cover': aspect === 'stretched',
+        })}
+        onFocus={onFocus ?? handleFocus}
+        onBlur={onBlur ?? handleBlur}
+        {...rest}
+      />
+    </div>
   );
 };
 
diff --git a/src/components/media-gallery.tsx b/src/components/media-gallery.tsx
index 198fee48a..db7bfd1d6 100644
--- a/src/components/media-gallery.tsx
+++ b/src/components/media-gallery.tsx
@@ -156,7 +156,7 @@ const Item: React.FC<IItem> = ({
         style={{ position, float, left, top, right, bottom, height, width: `${width}%` }}
       >
         <Suspense fallback={<div  className='media-gallery__item-thumbnail' />}>
-          <Gameboy className='media-gallery__item-thumbnail object-contain' src={attachment.url} />
+          <Gameboy className='media-gallery__item-thumbnail' src={attachment.url} />
         </Suspense>
       </div>
     );