diff --git a/src/components/md-deck/CardLayer.tsx b/src/components/md-deck/CardLayer.tsx
index 249d426..c1837ac 100644
--- a/src/components/md-deck/CardLayer.tsx
+++ b/src/components/md-deck/CardLayer.tsx
@@ -7,6 +7,7 @@ export interface CardLayerProps {
   layers: LayerConfig[];
   dimensions: Dimensions;
   cardData: CardData;
+  showBounds?: boolean;
 }
 
 /**
@@ -29,14 +30,27 @@ export function CardLayer(props: CardLayerProps) {
   return (
     <For each={props.layers}>
       {(layer) => (
-        <article
-          class="absolute flex items-center justify-center text-center prose prose-sm"
-          style={{
-            ...getLayerStyle(layer, props.dimensions),
-            'font-size': `${props.dimensions.fontSize}mm`
-          }}
-          innerHTML={renderLayerContent(layer, props.cardData)}
-        />
+        <>
+          <article
+            class="absolute flex items-center justify-center text-center prose prose-sm"
+            style={{
+              ...getLayerStyle(layer, props.dimensions),
+              'font-size': `${props.dimensions.fontSize}mm`
+            }}
+            innerHTML={renderLayerContent(layer, props.cardData)}
+          />
+          {props.showBounds && (
+            <div
+              class="absolute border-2 border-blue-500/50 pointer-events-none select-none"
+              style={{
+                left: `${(layer.x1 - 1) * props.dimensions.cellWidth}mm`,
+                top: `${(layer.y1 - 1) * props.dimensions.cellHeight}mm`,
+                width: `${(layer.x2 - layer.x1 + 1) * props.dimensions.cellWidth}mm`,
+                height: `${(layer.y2 - layer.y1 + 1) * props.dimensions.cellHeight}mm`
+              }}
+            />
+          )}
+        </>
       )}
     </For>
   );
diff --git a/src/components/md-deck/CardPreview.tsx b/src/components/md-deck/CardPreview.tsx
index 591fec3..93576b3 100644
--- a/src/components/md-deck/CardPreview.tsx
+++ b/src/components/md-deck/CardPreview.tsx
@@ -30,6 +30,7 @@ export function CardPreview(props: CardPreviewProps) {
         <div
           ref={cardRef}
           class="relative bg-white border border-gray-300 shadow-lg overflow-hidden"
+          classList={{ 'select-none': store.state.isEditing }}
           style={{
             width: `${store.state.dimensions?.cardWidth}mm`,
             height: `${store.state.dimensions?.cardHeight}mm`
@@ -80,6 +81,7 @@ export function CardPreview(props: CardPreviewProps) {
               layers={visibleLayers()}
               dimensions={store.state.dimensions!}
               cardData={currentCard()}
+              showBounds={store.state.isEditing}
             />
           </div>
         </div>