diff --git a/src/FluentWebControls/Extensions/ListDataExtensions.cs b/src/FluentWebControls/Extensions/ListDataExtensions.cs
index 09fd66b..c7bc2f2 100644
--- a/src/FluentWebControls/Extensions/ListDataExtensions.cs
+++ b/src/FluentWebControls/Extensions/ListDataExtensions.cs
@@ -44,6 +44,12 @@ public static ListData<T> WithItemClass<T>(this ListData<T> list, string @class)
 			return list;
 		}
 
+        public static ListData<T> WrapListItemInDivWithClass<T>(this ListData<T> list, string @class)
+		{
+			list.ItemDivCssClass = @class;
+			return list;
+		}
+
         public static ListData<T> WithData<T>(this ListData<T> list, string name, string value)
 		{
             list.Data = new NameValuePair
diff --git a/src/FluentWebControls/ListData.cs b/src/FluentWebControls/ListData.cs
index 637360f..8de2cf4 100644
--- a/src/FluentWebControls/ListData.cs
+++ b/src/FluentWebControls/ListData.cs
@@ -30,6 +30,7 @@ public ListData(IEnumerable<T> items)
 		public string CssClass { get; set; }
 		internal string Id { get; set; }
 		public string ItemCssClass { get; set; }
+		public string ItemDivCssClass { get; set; }
 		public string SpanContent { get; set; }
 		public string SpanCssClass { get; set; }
 		public string SpanId { get; set; }
@@ -77,6 +78,10 @@ private StringBuilder BeginListItem()
 				list.Append(ItemCssClass.Trim().CreateQuotedAttribute("class"));
 			}
 			list.Append('>');
+            if (ItemDivCssClass != null)
+            {
+                list.Append("<div " + ItemDivCssClass.Trim().CreateQuotedAttribute("class") + ">");
+            }
 			if (SpanCssClass != null)
 			{
 				list.Append(new SpanData(SpanContent).WithId(SpanId).WithCssClass(SpanCssClass).ToString());
@@ -91,10 +96,14 @@ private static StringBuilder EndList()
 			return list;
 		}
 
-		private static StringBuilder EndListItem()
+		private StringBuilder EndListItem()
 		{
 			var list = new StringBuilder();
-			list.Append("</li>");
+		    if (ItemDivCssClass != null)
+		    {
+                list.Append("</div>");
+		    }
+		    list.Append("</li>");
 			return list;
 		}