diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index 802d5cf8c..8be1cbf4d 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -74,8 +74,7 @@
 
 		<activity
 			android:name="org.briarproject.briar.android.login.StartupActivity"
-			android:label="@string/app_name"
-			android:windowSoftInputMode="stateUnchanged">
+			android:label="@string/app_name">
 		</activity>
 
 		<activity
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java
index 8a9104d96..c256f1edd 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java
@@ -21,6 +21,7 @@ import static android.view.inputmethod.EditorInfo.IME_ACTION_NONE;
 import static java.util.Objects.requireNonNull;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.briar.android.util.UiUtils.setError;
+import static org.briarproject.briar.android.util.UiUtils.showSoftKeyboard;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -63,6 +64,12 @@ public class AuthorNameFragment extends SetupFragment {
 		return TAG;
 	}
 
+	@Override
+	public void onResume() {
+		super.onResume();
+		showSoftKeyboard(authorNameInput);
+	}
+
 	@Override
 	protected String getHelpText() {
 		return getString(R.string.setup_name_explanation);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java
index 7dd63ee4d..ba8eaaf90 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java
@@ -13,8 +13,8 @@ import android.widget.ProgressBar;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.account.PowerView.OnCheckedChangedListener;
+import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.util.UiUtils;
 
 import static android.view.View.INVISIBLE;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java
index 9895530d1..d9cd65966 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java
@@ -61,6 +61,7 @@ public class SetPasswordFragment extends SetupFragment {
 		strengthMeter = v.findViewById(R.id.strength_meter);
 		passwordEntryWrapper = v.findViewById(R.id.password_entry_wrapper);
 		passwordEntry = v.findViewById(R.id.password_entry);
+		passwordEntry.requestFocus();
 		passwordConfirmationWrapper =
 				v.findViewById(R.id.password_confirm_wrapper);
 		passwordConfirmation = v.findViewById(R.id.password_confirm);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java
index 60828d058..f4e1a2766 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java
@@ -3,6 +3,7 @@ package org.briarproject.briar.android.login;
 import android.arch.lifecycle.ViewModelProvider;
 import android.arch.lifecycle.ViewModelProviders;
 import android.os.Bundle;
+import android.support.design.widget.TextInputEditText;
 import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
@@ -11,7 +12,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.ProgressBar;
 
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
@@ -44,7 +44,7 @@ public class PasswordFragment extends BaseFragment implements TextWatcher {
 	private Button signInButton;
 	private ProgressBar progress;
 	private TextInputLayout input;
-	private EditText password;
+	private TextInputEditText password;
 
 	@Override
 	public void injectFragment(ActivityComponent component) {
@@ -83,6 +83,12 @@ public class PasswordFragment extends BaseFragment implements TextWatcher {
 		return v;
 	}
 
+	@Override
+	public void onResume() {
+		super.onResume();
+		showSoftKeyboard(password);
+	}
+
 	@Override
 	public void beforeTextChanged(CharSequence s, int start, int count,
 			int after) {