diff --git a/native/account/registration/keyserver-selection.react.js b/native/account/registration/keyserver-selection.react.js
--- a/native/account/registration/keyserver-selection.react.js
+++ b/native/account/registration/keyserver-selection.react.js
@@ -1,6 +1,5 @@
 // @flow
 
-import invariant from 'invariant';
 import * as React from 'react';
 import { Text } from 'react-native';
 
@@ -67,10 +66,9 @@
   const { navigate } = props.navigation;
   const { coolOrNerdMode } = props.route.params.userSelections;
   const onSubmit = React.useCallback(() => {
-    invariant(
-      keyserverUsername,
-      'Button should be disabled if keyserverUsername is not set',
-    );
+    if (!keyserverUsername) {
+      return;
+    }
     navigate<'ConnectEthereum'>({
       name: ConnectEthereumRouteName,
       params: { userSelections: { coolOrNerdMode, keyserverUsername } },
@@ -121,6 +119,8 @@
             onChangeText={setCustomKeyserver}
             placeholder="Keyserver"
             onFocus={onCustomKeyserverFocus}
+            returnKeyType="go"
+            onSubmitEditing={onSubmit}
             ref={customKeyserverTextInputRef}
           />
         </RegistrationTile>