diff --git a/modules/luci-base/luasrc/view/cbi/mvalue.htm b/modules/luci-base/luasrc/view/cbi/mvalue.htm
index 246ef43aad..db17450d27 100644
--- a/modules/luci-base/luasrc/view/cbi/mvalue.htm
+++ b/modules/luci-base/luasrc/view/cbi/mvalue.htm
@@ -36,7 +36,7 @@
 				<label<%= attr("for", cbid.."-"..key)%>></label>
 				<%=pcdata(self.vallist[i])%>
 			</label>
-			<% if i == self.size then write('<br />') end %>
+			<% if self.size and (i % self.size) == 0 then write('<br />') end %>
 		<% end %>
 	</div>
 <% end %>