diff --git a/src/components/LabelDesigner.tsx b/src/components/LabelDesigner.tsx
index a0f9869..c75a419 100644
--- a/src/components/LabelDesigner.tsx
+++ b/src/components/LabelDesigner.tsx
@@ -1677,7 +1677,7 @@ export const LabelDesigner: React.FC<LabelDesignerProps> = ({
         <div
           ref={canvasAreaRef}
           className={`flex-1 ps-workspace-bg ps-design-canvas-touch flex items-center justify-center min-h-0 min-w-0 p-4 ${
-            allowInteractionOverflow ? 'overflow-visible' : 'overflow-auto'
+            allowInteractionOverflow ? 'overflow-visible' : 'overflow-auto scrollbar-hide overscroll-contain'
           }`}
           onPointerDown={handleWorkspacePointerDown}
           onClick={(e) => {
diff --git a/src/components/PreviewGrid.tsx b/src/components/PreviewGrid.tsx
index 8b80f0d..55248a2 100644
--- a/src/components/PreviewGrid.tsx
+++ b/src/components/PreviewGrid.tsx
@@ -705,7 +705,7 @@ export const LayoutPreview: React.FC<LayoutPreviewProps> = ({
       </div>
 
       <div
-        className={`flex-1 overflow-auto ps-workspace-bg min-h-0 ps-preview-workspace ${isMobileVariant ? 'p-3 mobile-preview-workspace' : 'p-6'
+        className={`flex-1 overflow-auto scrollbar-hide overscroll-contain ps-workspace-bg min-h-0 ps-preview-workspace ${isMobileVariant ? 'p-3 mobile-preview-workspace' : 'p-6'
           }`}
       >
         {!previewReady ? (
@@ -820,8 +820,7 @@ export const LayoutPreview: React.FC<LayoutPreviewProps> = ({
                         <div
                           key={cellIdx}
                           onClick={() => onSelectRowIndex(item.sourceIndex)}
-                          className={`bg-white text-center relative flex flex-col justify-center cursor-pointer box-border ${isActive ? 'ring-2 ring-inset ring-[#31a8ff] z-10' : ''
-                            }`}
+                          className={`bg-white text-center relative flex flex-col justify-center cursor-pointer box-border`}
                           style={{
                             width: `${labelWPx}px`,
                             height: `${labelHPx}px`,