diff --git a/src/com/limelight/Game.java b/src/com/limelight/Game.java
index be50170b..bc50b12e 100644
--- a/src/com/limelight/Game.java
+++ b/src/com/limelight/Game.java
@@ -15,6 +15,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.PixelFormat;
+import android.media.AudioManager;
 import android.net.ConnectivityManager;
 import android.os.Bundle;
 import android.view.InputDevice;
@@ -78,6 +79,9 @@ public class Game extends Activity implements OnGenericMotionListener, OnTouchLi
 		// We don't want a title bar
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		
+		// Change volume button behavior
+		setVolumeControlStream(AudioManager.STREAM_MUSIC);
+		
 		// Inflate the content
 		setContentView(R.layout.activity_game);