diff --git a/briar-android/src/net/sf/briar/android/SetupActivity.java b/briar-android/src/net/sf/briar/android/SetupActivity.java
index 931ef24201b8a9a765f13abaf15cfb62922a412b..c0d30894f2f03f5862ff3520f57f9dfeca11c471 100644
--- a/briar-android/src/net/sf/briar/android/SetupActivity.java
+++ b/briar-android/src/net/sf/briar/android/SetupActivity.java
@@ -38,6 +38,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 public class SetupActivity extends RoboActivity implements OnClickListener {
@@ -145,7 +146,10 @@ public class SetupActivity extends RoboActivity implements OnClickListener {
 		progress.setVisibility(GONE);
 		layout.addView(progress);
 
-		setContentView(layout);
+		ScrollView scroll = new ScrollView(this);
+		scroll.addView(layout);
+
+		setContentView(scroll);
 	}
 
 	private void enableOrDisableContinueButton() {