diff --git a/packages/core/src/hooks/useStyle.tsx b/packages/core/src/hooks/useStyle.tsx
index 9c6d086a2..0bea1498f 100644
--- a/packages/core/src/hooks/useStyle.tsx
+++ b/packages/core/src/hooks/useStyle.tsx
@@ -130,7 +130,6 @@ const tlcss = css`
   }
 
   .tl-container * {
-    user-select: none;
     box-sizing: border-box;
   }
 
diff --git a/packages/tldraw/src/shape/shapes/rectangle/rectangle.tsx b/packages/tldraw/src/shape/shapes/rectangle/rectangle.tsx
index 846bbcca1..25d23587d 100644
--- a/packages/tldraw/src/shape/shapes/rectangle/rectangle.tsx
+++ b/packages/tldraw/src/shape/shapes/rectangle/rectangle.tsx
@@ -134,7 +134,30 @@ export const Rectangle = new ShapeUtil<RectangleShape, SVGSVGElement, TLDrawMeta
   },
 
   Indicator({ shape }) {
-    return <path d={getRectangleIndicatorPathData(shape)} />
+    const {
+      style,
+      size: [width, height],
+    } = shape
+
+    const styles = getShapeStyle(style, false)
+    const strokeWidth = +styles.strokeWidth
+
+    const sw = strokeWidth
+
+    if (style.dash === DashStyle.Draw) {
+      return <path d={getRectangleIndicatorPathData(shape)} />
+    }
+
+    return (
+      <rect
+        x={sw}
+        y={sw}
+        rx={1}
+        ry={1}
+        width={Math.max(1, width - sw * 2)}
+        height={Math.max(1, height - sw * 2)}
+      />
+    )
   },
 
   getBounds(shape) {
diff --git a/packages/tldraw/src/shape/shapes/text/text.tsx b/packages/tldraw/src/shape/shapes/text/text.tsx
index 290c763ac..6abe33a3b 100644
--- a/packages/tldraw/src/shape/shapes/text/text.tsx
+++ b/packages/tldraw/src/shape/shapes/text/text.tsx
@@ -162,6 +162,7 @@ export const Text = new ShapeUtil<TextShape, HTMLDivElement, TLDrawMeta>(() => (
             style={{
               font,
               color: styles.stroke,
+              userSelect: isEditing ? 'all' : 'none',
             }}
             name="text"
             defaultValue={text}