diff --git a/src/org/kreed/tumult/NowPlayingActivity.java b/src/org/kreed/tumult/NowPlayingActivity.java
index 3ab43a03..401130d8 100644
--- a/src/org/kreed/tumult/NowPlayingActivity.java
+++ b/src/org/kreed/tumult/NowPlayingActivity.java
@@ -274,22 +274,27 @@ public class NowPlayingActivity extends Activity implements CoverViewWatcher, Se
 
 	public void clicked()
 	{
-		mControlsTop.setVisibility(View.VISIBLE);
-		mControlsBottom.setVisibility(View.VISIBLE);
-		
-		mPlayPauseButton.requestFocus();
-		
-		if (mStartTime == 0) {
-			try {
-				mStartTime = mService.getStartTime();
-				mDuration = mService.getDuration();
-			} catch (RemoteException e) {
-				return;
+		if (mControlsBottom.getVisibility() == View.VISIBLE) {
+			mControlsTop.setVisibility(View.GONE);
+			mControlsBottom.setVisibility(View.GONE);
+		} else {
+			mControlsTop.setVisibility(View.VISIBLE);
+			mControlsBottom.setVisibility(View.VISIBLE);
+			
+			mPlayPauseButton.requestFocus();
+			
+			if (mStartTime == 0) {
+				try {
+					mStartTime = mService.getStartTime();
+					mDuration = mService.getDuration();
+				} catch (RemoteException e) {
+					return;
+				}
 			}
+			
+			updateProgress();
+			sendHideMessage();
 		}
-		
-		updateProgress();
-		sendHideMessage();
 	}
 	
 	private String stringForTime(int ms)