diff --git a/tank-frontend/src/App.tsx b/tank-frontend/src/App.tsx
index 1496522..f5e11e6 100644
--- a/tank-frontend/src/App.tsx
+++ b/tank-frontend/src/App.tsx
@@ -8,8 +8,8 @@ import Scoreboard from './Scoreboard.tsx';
 import Button from './components/Button.tsx';
 import MapChooser from './MapChooser.tsx';
 import './App.css';
-import {getRandomTheme, useStoredTheme} from "./theme.ts";
-import { useState } from 'react';
+import {getRandomTheme, useStoredTheme} from './theme.ts';
+import {useState} from 'react';
 
 export default function App() {
     const [theme, setTheme] = useStoredTheme();
@@ -21,7 +21,7 @@ export default function App() {
 
         <Row>
             <h1 className="flex-grow">CCCB-Tanks!</h1>
-            <MapChooser />
+            <MapChooser theme={theme}/>
             <Button text="change colors" onClick={() => setTheme(_ => getRandomTheme())}/>
             <Button
                 onClick={() => window.open('https://github.com/kaesaecracker/cccb-tanks-cs', '_blank')?.focus()}
diff --git a/tank-frontend/src/MapChooser.css b/tank-frontend/src/MapChooser.css
index 77086a7..9bd5c79 100644
--- a/tank-frontend/src/MapChooser.css
+++ b/tank-frontend/src/MapChooser.css
@@ -7,3 +7,17 @@
     border-color: var(--color-primary);
     color: var(--color-primary);
 }
+
+.MapChooser-Row {
+    flex-wrap: wrap;
+}
+
+.MapChooser-Preview {
+    flex-grow: 1;
+    padding: var(--padding-normal);
+    border: solid var(--border-size-thin) var(--color-primary);
+}
+
+.MapChooser-Preview-Highlight {
+    border-color: var(--color-secondary);
+}
diff --git a/tank-frontend/src/MapChooser.tsx b/tank-frontend/src/MapChooser.tsx
index 292802c..15519ed 100644
--- a/tank-frontend/src/MapChooser.tsx
+++ b/tank-frontend/src/MapChooser.tsx
@@ -1,9 +1,84 @@
-import {ChangeEvent} from 'react';
-import {makeApiUrl} from './serverCalls';
-import './MapChooser.css';
+import {useState} from 'react';
 import {useMutation, useQuery} from '@tanstack/react-query';
+import {makeApiUrl, MapInfo} from './serverCalls';
+import Dialog from './components/Dialog.tsx';
+import PixelGridCanvas from './components/PixelGridCanvas.tsx';
+import Column from './components/Column.tsx';
+import {Theme} from './theme.ts';
+import Button from './components/Button.tsx';
+import Row from './components/Row.tsx';
+import './MapChooser.css';
 
-export default function MapChooser() {
+function base64ToArrayBuffer(base64: string) {
+    const binaryString = atob(base64);
+    const bytes = new Uint8ClampedArray(binaryString.length);
+    for (let i = 0; i < binaryString.length; i++) {
+        bytes[i] = binaryString.charCodeAt(i);
+    }
+    return bytes;
+}
+
+function MapPreview({mapName, theme, highlight, onClick}: {
+    readonly mapName: string,
+    readonly theme: Theme,
+    readonly highlight: boolean,
+    readonly onClick: () => void
+}) {
+    const query = useQuery({
+        queryKey: ['get-map', mapName],
+        queryFn: async () => {
+            const url = makeApiUrl(`/map/${mapName}`);
+            const response = await fetch(url, {method: 'GET'});
+            if (!response.ok)
+                throw new Error(`response failed with code ${response.status} (${response.status})${await response.text()}`);
+            return await response.json() as MapInfo;
+        }
+    });
+
+    if (query.isError)
+        return <p>{query.error.message}</p>;
+    else if (query.isPending)
+        return <p>loading...</p>;
+
+    const {name, preview} = query.data;
+
+    return <Column
+        key={mapName}
+        className={'MapChooser-Preview' + (highlight ? ' MapChooser-Preview-Highlight' : '')}
+        onClick={onClick}
+    >
+        <PixelGridCanvas pixels={base64ToArrayBuffer(preview)} theme={theme}/>
+        <p>{name}</p>
+    </Column>;
+}
+
+
+function MapChooserDialog({mapNames, theme, onClose, onConfirm}: {
+    readonly mapNames: string[];
+    readonly theme: Theme;
+    readonly onConfirm: (mapName: string) => void;
+    readonly onClose: () => void;
+}) {
+    const [chosenMap, setChosenMap] = useState<string>();
+    return <Dialog>
+        <h3>Choose a map</h3>
+        <Row className="MapChooser-Row">
+            {mapNames.map(name => <MapPreview
+                key={name}
+                mapName={name}
+                theme={theme}
+                highlight={chosenMap == name}
+                onClick={() => setChosenMap(name)}
+            />)}
+        </Row>
+        <Button text="confirm" disabled={!chosenMap} onClick={() => chosenMap && onConfirm(chosenMap)}/>
+        <Button text="cancel" onClick={onClose}/>
+    </Dialog>;
+}
+
+export default function MapChooser({theme}: {
+    readonly theme: Theme;
+}) {
     const query = useQuery({
         queryKey: ['get-maps'],
         queryFn: async () => {
@@ -27,22 +102,22 @@ export default function MapChooser() {
         }
     });
 
-    const onChange = (event: ChangeEvent<HTMLSelectElement>) => {
-        if (event.target.selectedIndex < 1)
-            return;
-        event.preventDefault();
+    const [open, setOpen] = useState(false);
 
-        const chosenMap = event.target.options[event.target.selectedIndex].value;
-        postMap.mutate(chosenMap);
-    };
-
-    if (query.isError)
-        return <></>;
-
-    const disabled = !query.isSuccess || postMap.isPending;
-
-    return <select className="MapChooser-DropDown" onChange={onChange} disabled={disabled}>
-        <option value="" defaultValue={''}>Choose map</option>
-        {query.isSuccess && query.data.map(m => <option key={m} value={m}>{m}</option>)}
-    </select>;
+    return <>
+        <Button text="Change map"
+                disabled={!query.isSuccess || postMap.isPending}
+                onClick={() => setOpen(true)}/>
+        {query.isSuccess && open &&
+            <MapChooserDialog
+                mapNames={query.data!}
+                theme={theme}
+                onClose={() => setOpen(false)}
+                onConfirm={name => {
+                    setOpen(false);
+                    postMap.mutate(name);
+                }}
+            />
+        }
+    </>;
 }
diff --git a/tank-frontend/src/components/Column.tsx b/tank-frontend/src/components/Column.tsx
index 6bb5d36..d936fa6 100644
--- a/tank-frontend/src/components/Column.tsx
+++ b/tank-frontend/src/components/Column.tsx
@@ -1,12 +1,13 @@
-import {ReactNode} from "react";
+import {MouseEventHandler, ReactNode} from 'react';
 
 import './Column.css'
 
-export default function Column({children, className}: {
-    children: ReactNode,
-    className?: string
+export default function Column({children, className, onClick}: {
+    children: ReactNode;
+    className?: string;
+    onClick?: MouseEventHandler<HTMLDivElement>;
 }) {
-    return <div className={'Column flex-column ' + (className ?? '')}>
+    return <div className={'Column flex-column ' + (className ?? '')} onClick={onClick}>
         {children}
     </div>
 }
diff --git a/tank-frontend/src/components/Dialog.css b/tank-frontend/src/components/Dialog.css
index 193905f..9eec3a1 100644
--- a/tank-frontend/src/components/Dialog.css
+++ b/tank-frontend/src/components/Dialog.css
@@ -10,4 +10,9 @@
 
     gap: 16px;
     padding: 16px;
+
+    max-height: 75vh;
+    max-width: 75vw;
+
+    overflow: scroll;
 }
diff --git a/tank-frontend/src/components/Dialog.tsx b/tank-frontend/src/components/Dialog.tsx
index 960efc3..ecbc95f 100644
--- a/tank-frontend/src/components/Dialog.tsx
+++ b/tank-frontend/src/components/Dialog.tsx
@@ -6,7 +6,7 @@ export default function Dialog({children, className}: {
     children: ReactNode;
     className?: string;
 }) {
-    return <Column className={'Dialog ' + className ?? ''}>
+    return <Column className={'Dialog ' + (className ?? '')}>
         {children}
     </Column>
 }
diff --git a/tank-frontend/src/serverCalls.tsx b/tank-frontend/src/serverCalls.tsx
index 66675fd..83e4f2d 100644
--- a/tank-frontend/src/serverCalls.tsx
+++ b/tank-frontend/src/serverCalls.tsx
@@ -34,6 +34,12 @@ export type PlayerInfoMessage = {
     readonly openConnections: number;
 }
 
+export type MapInfo = {
+    readonly name: string;
+    readonly typeName: string;
+    readonly preview: string;
+}
+
 export function useMyWebSocket<T = unknown>(url: string, options: Options = {}) {
     return useWebSocket<T>(url, {
         shouldReconnect: () => true,