diff --git a/src/org/kreed/vanilla/MediaAdapter.java b/src/org/kreed/vanilla/MediaAdapter.java
index 18d2d948..d0d39608 100644
--- a/src/org/kreed/vanilla/MediaAdapter.java
+++ b/src/org/kreed/vanilla/MediaAdapter.java
@@ -357,7 +357,8 @@ public class MediaAdapter extends CursorAdapter implements FilterQueryProvider {
 		@Override
 		public boolean onTouchEvent(MotionEvent event)
 		{
-			mExpanderPressed = event.getX() > getWidth() - mExpander.getWidth() - 3 * mTextSize / 2;
+			if (mExpandable)
+				mExpanderPressed = event.getX() > getWidth() - mExpander.getWidth() - 3 * mTextSize / 2;
 			return false;
 		}
 	}