diff --git a/lib/app.dart b/lib/app.dart
index d6c5bccd..3ff0b562 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -60,11 +60,6 @@ class JournalApp extends StatefulWidget {
 
     var dir = await getApplicationDocumentsDirectory();
     appState.gitBaseDirectory = dir.path;
-    Log.i("GitBaseDirectory: ${dir.path}");
-    await for (var fsEntity in dir.list()) {
-      Log.i("    ${fsEntity.path}");
-    }
-    Log.i('-----');
 
     await settings.migrate(pref, appState.gitBaseDirectory);
 
diff --git a/lib/settings.dart b/lib/settings.dart
index 8fc9a2f8..9242503f 100644
--- a/lib/settings.dart
+++ b/lib/settings.dart
@@ -334,21 +334,22 @@ class Settings extends ChangeNotifier {
       var oldDir = Directory(p.join(gitBaseDir, '../files'));
       if (oldDir.existsSync()) {
         // Move everything from the old dir
-        await for (var fsEntity in oldDir.list()) {
+        var stream = await (oldDir.list().toList());
+        for (var fsEntity in stream) {
           var stat = await fsEntity.stat();
           if (stat.type != FileSystemEntityType.directory) {
             var fileName = p.basename(fsEntity.path);
             if (fileName == 'cache.json') {
               await File(fsEntity.path).delete();
             }
-            return;
+            continue;
           }
 
           var folderName = p.basename(fsEntity.path);
           if (folderName.startsWith('journal') ||
               folderName.startsWith('ssh')) {
             var newPath = p.join(gitBaseDir, folderName);
-            if (Directory(newPath).existsSync()) {
+            if (!Directory(newPath).existsSync()) {
               await Directory(fsEntity.path).rename(newPath);
             }
           }