diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5c39d164..04ac1c06 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -31,7 +31,7 @@
 	<string name="shuffle_disabling">Shuffle disabled</string>
 	<string name="repeat_enable">Enable Repeat</string>
 	<string name="repeat_disable">Disable Repeat</string>
-	<string name="repeat_enabling">Repeat enabled</string>
+	<string name="repeat_enabling">Repeat enabled. The current song and any songs you have added after it will be repeated.</string>
 	<string name="repeat_disabling">Repeat disabled</string>
 
 	<!-- Widgets -->
diff --git a/src/org/kreed/vanilla/PlaybackActivity.java b/src/org/kreed/vanilla/PlaybackActivity.java
index e87f3260..bacd0bd8 100644
--- a/src/org/kreed/vanilla/PlaybackActivity.java
+++ b/src/org/kreed/vanilla/PlaybackActivity.java
@@ -240,7 +240,7 @@ public class PlaybackActivity extends Activity implements Handler.Callback, View
 				text = enabling ? R.string.repeat_enabling : R.string.repeat_disabling;
 
 			if (text != -1)
-				Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
+				Toast.makeText(this, text, enabling ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT).show();
 
 			ContextApplication.getService().toggleFlag(flag);
 			break;