diff --git a/packages/flutter/lib/rendering/stack.dart b/packages/flutter/lib/rendering/stack.dart
index ff477fc34e..8b7a2b7a27 100644
--- a/packages/flutter/lib/rendering/stack.dart
+++ b/packages/flutter/lib/rendering/stack.dart
@@ -38,12 +38,13 @@ class RenderStack extends RenderBox with ContainerRenderObjectMixin<RenderBox, S
     addAll(children);
   }
 
+  bool _hasVisualOverflow = false;
+
   void setupParentData(RenderBox child) {
     if (child.parentData is! StackParentData)
       child.parentData = new StackParentData();
   }
 
-
   double getMinIntrinsicWidth(BoxConstraints constraints) {
     double width = constraints.minWidth;
     RenderBox child = firstChild;
@@ -111,6 +112,7 @@ class RenderStack extends RenderBox with ContainerRenderObjectMixin<RenderBox, S
   }
 
   void performLayout() {
+    _hasVisualOverflow = false;
     bool hasNonPositionedChildren = false;
 
     double width = 0.0;
@@ -175,14 +177,18 @@ class RenderStack extends RenderBox with ContainerRenderObjectMixin<RenderBox, S
           x = childData.left;
         else if (childData.right != null)
           x = size.width - childData.right - child.size.width;
-        assert(x >= 0.0 && x + child.size.width <= size.width);
+
+        if (x < 0.0 || x + child.size.width > size.width)
+          _hasVisualOverflow = true;
 
         double y = 0.0;
         if (childData.top != null)
           y = childData.top;
         else if (childData.bottom != null)
           y = size.height - childData.bottom - child.size.height;
-        assert(y >= 0.0 && y + child.size.height <= size.height);
+
+        if (y < 0.0 || y + child.size.height > size.height)
+          _hasVisualOverflow = true;
 
         childData.position = new Point(x, y);
       }
@@ -196,6 +202,13 @@ class RenderStack extends RenderBox with ContainerRenderObjectMixin<RenderBox, S
   }
 
   void paint(PaintingCanvas canvas, Offset offset) {
-    defaultPaint(canvas, offset);
+    if (_hasVisualOverflow) {
+      canvas.save();
+      canvas.clipRect(offset & size);
+      defaultPaint(canvas, offset);
+      canvas.restore();
+    } else {
+      defaultPaint(canvas, offset);
+    }
   }
 }
diff --git a/packages/flutter/lib/widgets/mimic.dart b/packages/flutter/lib/widgets/mimic.dart
index 5428d6efbc..99da565c0f 100644
--- a/packages/flutter/lib/widgets/mimic.dart
+++ b/packages/flutter/lib/widgets/mimic.dart
@@ -120,8 +120,7 @@ class Mimicable extends StatefulComponent {
     if (_didStartMimic)
       return;
     assert(_mimic != null);
-    // TODO(abarth): We'll need to convert Point.origin to global coordinates.
-    Point globalPosition = Point.origin;
+    Point globalPosition = localToGlobal(Point.origin);
     _mimic._startMimic(key, globalPosition & _size);
     _didStartMimic = true;
   }
diff --git a/packages/flutter/lib/widgets/mimic_overlay.dart b/packages/flutter/lib/widgets/mimic_overlay.dart
index 707bc683b9..4d80e79b94 100644
--- a/packages/flutter/lib/widgets/mimic_overlay.dart
+++ b/packages/flutter/lib/widgets/mimic_overlay.dart
@@ -69,7 +69,7 @@ class MimicOverlay extends AnimatedComponent {
   void _handleMimicCallback(Rect globalBounds) {
     setState(() {
       // TODO(abarth): We need to convert global bounds into local coordinates.
-      _mimicBounds.begin = globalBounds;
+      _mimicBounds.begin = globalToLocal(globalBounds.topLeft) & globalBounds.size;
       _expandPerformance.forward();
     });
   }