diff --git a/app/components/login/token-help.js b/app/components/login/token-help.js
index b4742fd..9908a60 100644
--- a/app/components/login/token-help.js
+++ b/app/components/login/token-help.js
@@ -6,6 +6,7 @@ const {
   StyleSheet,
   Text,
   View,
+  TouchableWithoutFeedback
 } = React;
 
 const styles = StyleSheet.create({
@@ -38,12 +39,16 @@ const styles = StyleSheet.create({
 });
 
 export default class Login extends React.Component {
+  hide() {
+    this.refs.modal.close();
+  }
   render() {
     return (
       <Modal
         isOpen={this.props.open}
         style={styles.modal}
         ref="modal"
+        onClosed={this.props.onClose}
         backdrop={true}>
         <View style={styles.modalView}>
           <Text style={styles.title}>
@@ -56,9 +61,11 @@ export default class Login extends React.Component {
             To generate a new token, visit your CircleCI accounts page.
           </Text>
         </View>
-        <Text style={[styles.text, styles.dismiss]}>
-          Swipe down to dismiss
-        </Text>
+        <TouchableWithoutFeedback onPress={this.hide.bind(this)}>
+          <Text style={[styles.text, styles.dismiss]}>
+            Swipe down to dismiss
+          </Text>
+        </TouchableWithoutFeedback>
       </Modal>
     );
   }
diff --git a/app/components/routes/login.js b/app/components/routes/login.js
index 4ac075e..96ca8fb 100644
--- a/app/components/routes/login.js
+++ b/app/components/routes/login.js
@@ -7,7 +7,6 @@ import { set } from '../../api/token';
 import loaderHandler from 'react-native-busy-indicator/LoaderHandler';
 import BusyIndicator from 'react-native-busy-indicator';
 
-
 const dismissKeyboard = require('dismissKeyboard');
 
 const {
@@ -43,11 +42,6 @@ const styles = StyleSheet.create({
     backgroundColor: GlobalStyles.get('CIRCLE_GREEN'),
     borderColor: GlobalStyles.get('CIRCLE_GREEN'),
   },
-  infoButton: {
-    flex: 0.08,
-    backgroundColor: GlobalStyles.get('CIRCLE_NAVBAR_BG'),
-    borderColor: GlobalStyles.get('CIRCLE_NAVBAR_BG'),
-  },
   button: {
     justifyContent: 'center',
     alignItems: 'center',
@@ -103,6 +97,7 @@ export default class Login extends React.Component {
   }
 
   proceed() {
+    this.hideTokenHelp();
     this.props.nav.push(RouteMaster.get('HOME'));
   }