diff --git a/packages/tldraw/src/state/shapes/DrawUtil/DrawUtil.tsx b/packages/tldraw/src/state/shapes/DrawUtil/DrawUtil.tsx
index 1952264fe..08196d89c 100644
--- a/packages/tldraw/src/state/shapes/DrawUtil/DrawUtil.tsx
+++ b/packages/tldraw/src/state/shapes/DrawUtil/DrawUtil.tsx
@@ -99,7 +99,7 @@ export class DrawUtil extends TDShapeUtil<T, E> {
           <SVGContainer ref={ref} id={shape.id + '_svg'} {...events}>
             <g opacity={isGhost ? GHOSTED_OPACITY : 1}>
               <path
-                className={shouldFill && isSelected ? 'tl-fill-hitarea' : 'tl-stroke-hitarea'}
+                className={shouldFill || isSelected ? 'tl-fill-hitarea' : 'tl-stroke-hitarea'}
                 d={pathTDSnapshot}
               />
               {shouldFill && (
diff --git a/packages/tldraw/src/state/shapes/EllipseUtil/EllipseUtil.tsx b/packages/tldraw/src/state/shapes/EllipseUtil/EllipseUtil.tsx
index 62fe7588a..5a26f1446 100644
--- a/packages/tldraw/src/state/shapes/EllipseUtil/EllipseUtil.tsx
+++ b/packages/tldraw/src/state/shapes/EllipseUtil/EllipseUtil.tsx
@@ -69,7 +69,7 @@ export class EllipseUtil extends TDShapeUtil<T, E> {
               />
             )}
             <ellipse
-              className={isSelected ? 'tl-fill-hitarea' : 'tl-stroke-hitarea'}
+              className={style.isFilled || isSelected ? 'tl-fill-hitarea' : 'tl-stroke-hitarea'}
               cx={radiusX}
               cy={radiusY}
               rx={radiusX}
diff --git a/packages/tldraw/src/state/shapes/RectangleUtil/RectangleUtil.tsx b/packages/tldraw/src/state/shapes/RectangleUtil/RectangleUtil.tsx
index 6bf88e425..df3db8947 100644
--- a/packages/tldraw/src/state/shapes/RectangleUtil/RectangleUtil.tsx
+++ b/packages/tldraw/src/state/shapes/RectangleUtil/RectangleUtil.tsx
@@ -64,7 +64,7 @@ export class RectangleUtil extends TDShapeUtil<T, E> {
               />
             )}
             <path
-              className={isSelected ? 'tl-fill-hitarea' : 'tl-stroke-hitarea'}
+              className={style.isFilled || isSelected ? 'tl-fill-hitarea' : 'tl-stroke-hitarea'}
               d={indicatorPath}
             />
             <path