diff --git a/src/actions/sync_backend.js b/src/actions/sync_backend.js
index aa69449fd..2eabe2707 100644
--- a/src/actions/sync_backend.js
+++ b/src/actions/sync_backend.js
@@ -25,6 +25,9 @@ export const signOut = () => (dispatch, getState) => {
       persistField('gitLabProject', null);
       createGitlabOAuth().reset();
       break;
+    case 'AndroidStorage':
+        persistField('orgDirectory', null);
+        break;
     default:
   }
 
diff --git a/src/components/SyncServiceSignIn/index.js b/src/components/SyncServiceSignIn/index.js
index 13569ed92..38ef97572 100644
--- a/src/components/SyncServiceSignIn/index.js
+++ b/src/components/SyncServiceSignIn/index.js
@@ -172,27 +172,34 @@ function AndroidStorage() {
           <form
             onSubmit={(event) => {
               event.preventDefault();
-              pickDirectory().then(result => {
-                const {uri} = result
-                persistField('authenticatedSyncService', 'AndroidStorage');
-                persistField('orgDirectory', uri);
-              })
-              window.location = window.location.origin + '?android';
+              persistField('authenticatedSyncService', 'AndroidStorage');
+              persistField('orgDirectory', orgDirectory);
+              window.location = window.location + '?path=org';
             }}
           >
+            <div>
             <p>
               <label htmlFor="input-org-dir">Org directory:</label>
               <input
                 id="input-org-dir"
-                name="orgDir"
-                type="text"
+                name="url"
+                type="url"
                 value={orgDirectory}
                 className="textfield"
-                readOnly
-                onChange={(e) => setOrgDirectory(e.target.value)}
               />
             </p>
-            <input type="submit" value="Use directory" />
+            <button
+                id="org-pick-directory"
+                name="orgDir"
+                onClick={(event) => {
+                  event.preventDefault();
+                  pickDirectory().then(result => {
+                    const {uri} = result
+                    setOrgDirectory(uri)
+                  })
+                }}>Choose org dir</button>
+            </div>
+            <input type="submit" value="Use selected directory" />
           </form>
         </>
       )}
diff --git a/src/sync_backend_clients/android_sync_backend_client.js b/src/sync_backend_clients/android_sync_backend_client.js
index e56699f04..fea881262 100644
--- a/src/sync_backend_clients/android_sync_backend_client.js
+++ b/src/sync_backend_clients/android_sync_backend_client.js
@@ -33,9 +33,7 @@ export const filterAndSortDirectoryListing = (listing) => {
     });
 };
 
-export default (uri) => {
-  // TODO: request/check permissions for file during signIn?!
-  let uri = uri;
+export default () => {
   const isSignedIn = () =>
     new Promise((resolve) => resolve(true));