diff --git a/library/src/main/java/me/gujun/android/taggroup/TagGroup.java b/library/src/main/java/me/gujun/android/taggroup/TagGroup.java
index 5f2ae99..31fd9bc 100644
--- a/library/src/main/java/me/gujun/android/taggroup/TagGroup.java
+++ b/library/src/main/java/me/gujun/android/taggroup/TagGroup.java
@@ -212,6 +212,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
         final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
         final int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+        final int contentWidth = widthSize - getPaddingLeft() - getPaddingRight();
 
         measureChildren(widthMeasureSpec, heightMeasureSpec);
 
@@ -230,7 +231,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
             if (child.getVisibility() != GONE) {
                 rowWidth += childWidth;
-                if (rowWidth > widthSize) { // Next line.
+                if (rowWidth > contentWidth) { // Next line.
                     rowWidth = childWidth; // The next row width.
                     height += rowMaxHeight + verticalSpacing;
                     rowMaxHeight = childHeight; // The next row max height.
@@ -1022,4 +1023,4 @@ public boolean deleteSurroundingText(int beforeLength, int afterLength) {
             }
         }
     }
-}
\ No newline at end of file
+}