diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java
index 3967f79..008bc40 100644
--- a/src/com/android/camera/ui/PieRenderer.java
+++ b/src/com/android/camera/ui/PieRenderer.java
@@ -114,7 +114,7 @@
     private int mPieCenterX;
     private int mPieCenterY;
     private int mSliceRadius;
-    private int mArcRadius;
+    private int mArcRadius, mMaxArcRadius;
     private int mArcOffset;
 
     private int mDialAngle;
@@ -221,6 +221,7 @@
         mMenuArcPaint.setStyle(Paint.Style.STROKE);
         mSliceRadius = res.getDimensionPixelSize(R.dimen.pie_item_radius);
         mArcRadius = res.getDimensionPixelSize(R.dimen.pie_arc_radius);
+        mMaxArcRadius = mArcRadius;
         mArcOffset = res.getDimensionPixelSize(R.dimen.pie_arc_offset);
         mLabel = new TextDrawable(res);
         mLabel.setDropShadow(true);
@@ -348,6 +349,12 @@
         mCenterX = (r - l) / 2;
         mCenterY = (b - t) / 2;
 
+        int layoutWidth = r - l;
+        if( (layoutWidth > 0) && ((mMaxArcRadius + mCenterX) > layoutWidth) ){
+            mArcRadius = layoutWidth - mCenterX;
+        } else {
+            mArcRadius = mMaxArcRadius;
+        }
         mFocusX = mCenterX;
         mFocusY = mCenterY;
         resetPieCenter();
