diff --git a/core/res/layout/list_item_filter.xml b/core/res/layout/list_item_filter.xml
index fa62800e..8d1e4444 100644
--- a/core/res/layout/list_item_filter.xml
+++ b/core/res/layout/list_item_filter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
 	android:paddingBottom="@dimen/margin_half"
 	android:paddingLeft="@dimen/margin_default"
 	android:paddingRight="@dimen/margin_default"
@@ -9,7 +9,7 @@
 
 	<TextView
 		android:id="@+id/item_text"
-		android:layout_width="match_parent"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:textIsSelectable="false" />
 
diff --git a/core/res/layout/list_item_simple.xml b/core/res/layout/list_item_simple.xml
index 030e8a7d..0a62b6d7 100644
--- a/core/res/layout/list_item_simple.xml
+++ b/core/res/layout/list_item_simple.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
 	android:paddingBottom="4dip"
 	android:paddingLeft="@dimen/margin_default"
 	android:paddingRight="@dimen/margin_default"
@@ -9,7 +9,7 @@
 
 	<TextView
 		android:id="@+id/item_text"
-		android:layout_width="match_parent"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:textSize="@dimen/text_default"
 		android:textIsSelectable="false"
diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java
index 725c5418..1d6a10d4 100644
--- a/core/src/org/transdroid/core/gui/TorrentsActivity.java
+++ b/core/src/org/transdroid/core/gui/TorrentsActivity.java
@@ -359,6 +359,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 			else
 				getSupportFragmentManager().beginTransaction().hide(fragmentDetails).commit();
 		}
+		supportInvalidateOptionsMenu();
 	}
 
 	/**