diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManager.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManager.java
index 48842039f..9c974118f 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManager.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManager.java
@@ -52,6 +52,7 @@ import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
+import static org.briarproject.briar.android.util.QrCodeUtils.HOTSPOT_QRCODE_FACTOR;
 import static org.briarproject.briar.android.util.UiUtils.handleException;
 
 @MethodsNotNullByDefault
@@ -334,7 +335,8 @@ class HotspotManager {
 		ioExecutor.execute(() -> {
 			String content = createWifiLoginString(group.getNetworkName(),
 					group.getPassphrase());
-			Bitmap qrCode = QrCodeUtils.createQrCode(dm, content);
+			Bitmap qrCode = QrCodeUtils.createQrCode(
+					(int) (dm.heightPixels * HOTSPOT_QRCODE_FACTOR), content);
 			NetworkConfig config = new NetworkConfig(group.getNetworkName(),
 					group.getPassphrase(), qrCode);
 			listener.onHotspotStarted(config);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebServerManager.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebServerManager.java
index 60240a996..b26b19340 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebServerManager.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebServerManager.java
@@ -27,6 +27,7 @@ import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.NetworkUtils.getNetworkInterfaces;
 import static org.briarproject.briar.android.hotspot.WebServer.PORT;
+import static org.briarproject.briar.android.util.QrCodeUtils.HOTSPOT_QRCODE_FACTOR;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -83,7 +84,8 @@ class WebServerManager {
 			}
 			url = "http://" + address.getHostAddress() + ":" + PORT;
 		}
-		Bitmap qrCode = QrCodeUtils.createQrCode(dm, url);
+		Bitmap qrCode = QrCodeUtils.createQrCode(
+				(int) (dm.heightPixels * HOTSPOT_QRCODE_FACTOR), url);
 		listener.onWebServerStarted(new WebsiteConfig(url, qrCode));
 	}
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/QrCodeUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/util/QrCodeUtils.java
index ae8fa55e6..54884a500 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/util/QrCodeUtils.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/util/QrCodeUtils.java
@@ -26,13 +26,19 @@ public class QrCodeUtils {
 
 	private static final Logger LOG = getLogger(QrCodeUtils.class.getName());
 
+	public static final double HOTSPOT_QRCODE_FACTOR = 0.35;
+
 	@Nullable
 	public static Bitmap createQrCode(DisplayMetrics dm, String input) {
-		int smallestDimen = Math.min(dm.widthPixels, dm.heightPixels);
+		return createQrCode(Math.min(dm.widthPixels, dm.heightPixels), input);
+	}
+
+	@Nullable
+	public static Bitmap createQrCode(int edgeLen, String input) {
 		try {
 			// Generate QR code
 			BitMatrix encoded = new QRCodeWriter().encode(input, QR_CODE,
-					smallestDimen, smallestDimen);
+					edgeLen, edgeLen);
 			return renderQrCode(encoded);
 		} catch (WriterException e) {
 			logException(LOG, WARNING, e);
diff --git a/briar-android/src/main/res/layout/fragment_hotspot_manual.xml b/briar-android/src/main/res/layout/fragment_hotspot_manual.xml
index 9acc34eae..638baedd1 100644
--- a/briar-android/src/main/res/layout/fragment_hotspot_manual.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_manual.xml
@@ -4,6 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:scrollbars="vertical"
 	android:fillViewport="true">
 
 	<androidx.constraintlayout.widget.ConstraintLayout
diff --git a/briar-android/src/main/res/layout/fragment_hotspot_qr.xml b/briar-android/src/main/res/layout/fragment_hotspot_qr.xml
index d25de032d..4c8aae605 100644
--- a/briar-android/src/main/res/layout/fragment_hotspot_qr.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_qr.xml
@@ -4,6 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:scrollbars="vertical"
 	android:fillViewport="true">
 
 	<androidx.constraintlayout.widget.ConstraintLayout