diff --git a/core/res/layout/actionbar_serverstatus.xml b/core/res/layout/actionbar_serverstatus.xml
index 0e9775d9..a99a3ecb 100644
--- a/core/res/layout/actionbar_serverstatus.xml
+++ b/core/res/layout/actionbar_serverstatus.xml
@@ -81,7 +81,7 @@
 
 		<TextView
 			android:id="@+id/upspeed_text"
-			android:layout_width="wrap_content"
+			android:layout_width="@dimen/ui_serverstatus_width"
 			android:layout_height="wrap_content"
 			android:layout_alignLeft="@id/upcount_text"
 			android:layout_alignParentRight="true"
@@ -94,7 +94,7 @@
 
 		<TextView
 			android:id="@+id/downspeed_text"
-			android:layout_width="wrap_content"
+			android:layout_width="@dimen/ui_serverstatus_width"
 			android:layout_height="wrap_content"
 			android:layout_alignLeft="@id/downcount_text"
 			android:layout_alignRight="@id/downcount_sign"
diff --git a/core/src/org/transdroid/core/gui/DetailsFragment.java b/core/src/org/transdroid/core/gui/DetailsFragment.java
index 0c83647d..191fbbdb 100644
--- a/core/src/org/transdroid/core/gui/DetailsFragment.java
+++ b/core/src/org/transdroid/core/gui/DetailsFragment.java
@@ -320,8 +320,9 @@ public class DetailsFragment extends SherlockFragment implements OnTrackersUpdat
 
 	@OptionsItem(resName = "action_setlabel")
 	protected void setLabel() {
-		new SetLabelDialog().setOnLabelPickedListener(this).setCurrentLabels(currentLabels)
-				.show(getFragmentManager(), "SetLabelDialog");
+		if (currentLabels == null)
+			new SetLabelDialog().setOnLabelPickedListener(this).setCurrentLabels(currentLabels)
+					.show(getFragmentManager(), "SetLabelDialog");
 	}
 
 	@OptionsItem(resName = "action_forcerecheck")
diff --git a/core/src/org/transdroid/core/gui/TorrentsFragment.java b/core/src/org/transdroid/core/gui/TorrentsFragment.java
index 6bdd7d20..57b7e2f6 100644
--- a/core/src/org/transdroid/core/gui/TorrentsFragment.java
+++ b/core/src/org/transdroid/core/gui/TorrentsFragment.java
@@ -318,7 +318,8 @@ public class TorrentsFragment extends SherlockFragment implements OnLabelPickedL
 				return true;
 			} else if (itemId == R.id.action_setlabel) {
 				lastMultiSelectedTorrents = checked;
-				new SetLabelDialog().setOnLabelPickedListener(TorrentsFragment.this).setCurrentLabels(currentLabels)
+				if (currentLabels != null)
+					new SetLabelDialog().setOnLabelPickedListener(TorrentsFragment.this).setCurrentLabels(currentLabels)
 						.show(getFragmentManager(), "SetLabelDialog");
 				mode.finish();
 				return true;