diff --git a/state/shape-utils/ellipse.tsx b/state/shape-utils/ellipse.tsx
index 31f702a9c..8ee76b2ce 100644
--- a/state/shape-utils/ellipse.tsx
+++ b/state/shape-utils/ellipse.tsx
@@ -59,17 +59,15 @@ const ellipse = registerShapeUtils<EllipseShape>({
 
       return (
         <>
-          {style.isFilled && (
-            <ellipse
-              cx={radiusX}
-              cy={radiusY}
-              rx={rx}
-              ry={ry}
-              stroke="none"
-              fill={styles.fill}
-              pointerEvents="fill"
-            />
-          )}
+          <ellipse
+            cx={radiusX}
+            cy={radiusY}
+            rx={rx}
+            ry={ry}
+            stroke="none"
+            fill={style.isFilled ? styles.fill : 'transparent'}
+            pointerEvents="all"
+          />
           <path
             d={path}
             fill={styles.stroke}
@@ -106,7 +104,7 @@ const ellipse = registerShapeUtils<EllipseShape>({
         strokeWidth={sw}
         strokeDasharray={strokeDasharray}
         strokeDashoffset={strokeDashoffset}
-        pointerEvents={style.isFilled ? 'all' : 'stroke'}
+        pointerEvents="all"
       />
     )
   },
diff --git a/state/shape-utils/rectangle.tsx b/state/shape-utils/rectangle.tsx
index 3bdcc0389..85bd05b19 100644
--- a/state/shape-utils/rectangle.tsx
+++ b/state/shape-utils/rectangle.tsx
@@ -40,26 +40,23 @@ const rectangle = registerShapeUtils<RectangleShape>({
 
       return (
         <>
-          {style.isFilled && (
-            <rect
-              rx={radius}
-              ry={radius}
-              x={+styles.strokeWidth / 2}
-              y={+styles.strokeWidth / 2}
-              width={Math.max(0, size[0] - strokeWidth)}
-              height={Math.max(0, size[1] - strokeWidth)}
-              strokeWidth={0}
-              fill={styles.fill}
-              stroke={styles.stroke}
-            />
-          )}
+          <rect
+            rx={radius}
+            ry={radius}
+            x={+styles.strokeWidth / 2}
+            y={+styles.strokeWidth / 2}
+            width={Math.max(0, size[0] - strokeWidth)}
+            height={Math.max(0, size[1] - strokeWidth)}
+            fill={style.isFilled ? styles.fill : 'transparent'}
+            stroke="none"
+          />
           <path
             d={pathData}
             fill={styles.stroke}
             stroke={styles.stroke}
             strokeWidth={styles.strokeWidth}
             filter={isHovered ? 'url(#expand)' : 'none'}
-            pointerEvents={style.isFilled ? 'all' : 'stroke'}
+            pointerEvents="all"
           />
         </>
       )
@@ -110,7 +107,7 @@ const rectangle = registerShapeUtils<RectangleShape>({
           fill={styles.fill}
           stroke="transparent"
           strokeWidth={sw}
-          pointerEvents={style.isFilled ? 'all' : 'stroke'}
+          pointerEvents="all"
         />
         <g filter={isHovered ? 'url(#expand)' : 'none'} pointerEvents="stroke">
           {paths}