diff --git a/res/layout/library_row_expandable.xml b/res/layout/library_row_expandable.xml
index 6277b69d..0a470b8b 100644
--- a/res/layout/library_row_expandable.xml
+++ b/res/layout/library_row_expandable.xml
@@ -47,6 +47,7 @@ THE SOFTWARE.
 		android:id="@+id/divider"
 		android:layout_width="1dip"
 		android:layout_height="fill_parent"
+		android:visibility="gone"
 		android:background="?divider_color" />
 	<ImageView
 		android:id="@+id/arrow"
diff --git a/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java b/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
index 3de7da58..d9f2d059 100644
--- a/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
@@ -198,6 +198,7 @@ public class FileSystemAdapter
 			view = mInflater.inflate(R.layout.library_row_expandable, null);
 			holder = new ViewHolder();
 			holder.text = (TextView)view.findViewById(R.id.text);
+			holder.divider = (View)view.findViewById(R.id.divider);
 			holder.arrow = (ImageView)view.findViewById(R.id.arrow);
 			holder.text.setOnClickListener(this);
 			holder.arrow.setOnClickListener(this);
@@ -212,6 +213,7 @@ public class FileSystemAdapter
 		holder.id = pos;
 		holder.text.setText(file.getName());
 		holder.arrow.setVisibility(isDirectory ? View.VISIBLE : View.GONE);
+		holder.divider.setVisibility(isDirectory ? View.VISIBLE : View.GONE);
 		holder.text.setCompoundDrawablesWithIntrinsicBounds(isDirectory ? mFolderIcon : null, null, null, null);
 		return view;
 	}
diff --git a/src/ch/blinkenlights/android/vanilla/MediaAdapter.java b/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
index 090fb18c..820c3351 100644
--- a/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
@@ -462,12 +462,14 @@ public class MediaAdapter
 			view.setTag(holder);
 
 			holder.text = (TextView)view.findViewById(R.id.text);
+			holder.divider = (View)view.findViewById(R.id.divider);
 			holder.arrow = (ImageView)view.findViewById(R.id.arrow);
 			holder.cover = (LazyCoverView)view.findViewById(R.id.cover);
 			holder.arrow.setOnClickListener(this);
 			holder.text.setOnClickListener(this);
 			holder.cover.setOnClickListener(this);
 
+			holder.divider.setVisibility(mExpandable ? View.VISIBLE : View.GONE);
 			holder.arrow.setVisibility(mExpandable ? View.VISIBLE : View.GONE);
 			holder.cover.setVisibility(mCoverCacheType != MediaUtils.TYPE_INVALID ? View.VISIBLE : View.GONE);
 			holder.cover.setup(mLooper);
diff --git a/src/ch/blinkenlights/android/vanilla/ViewHolder.java b/src/ch/blinkenlights/android/vanilla/ViewHolder.java
index b39166e0..3dea5ff7 100644
--- a/src/ch/blinkenlights/android/vanilla/ViewHolder.java
+++ b/src/ch/blinkenlights/android/vanilla/ViewHolder.java
@@ -17,6 +17,7 @@
 
 package ch.blinkenlights.android.vanilla;
 
+import android.view.View;
 import android.widget.TextView;
 import android.widget.ImageView;
 
@@ -25,6 +26,7 @@ public class ViewHolder {
 	public long id;
 	public String title;
 	public TextView text;
+	public View divider;
 	public ImageView arrow;
 	public LazyCoverView cover;
 }