diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/WrappingLinearLayout.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/WrappingLinearLayout.java
index 4ec5088f..2b835208 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/views/WrappingLinearLayout.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/WrappingLinearLayout.java
@@ -98,7 +98,7 @@ public class WrappingLinearLayout extends ViewGroup{
 					xOffset+=mlp.leftMargin+mlp.rightMargin;
 				}
 				firstInRow=false;
-			}else{
+			}else if(currentRowIndex<rowHeights.size()-1){
 				xOffset=rtl ? getPaddingRight() : getPaddingLeft();
 				yOffset+=rowHeight+verticalGap;
 				currentRowIndex++;