diff --git a/lib/app.dart b/lib/app.dart
index c8a38bfe..448f3d08 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -16,7 +16,6 @@ import 'package:gitjournal/themes.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:dynamic_theme/dynamic_theme.dart';
 
-import 'screens/folder_listing.dart';
 import 'screens/githostsetup_screens.dart';
 import 'screens/home_screen.dart';
 import 'screens/onboarding_screens.dart';
@@ -121,7 +120,6 @@ class JournalApp extends StatelessWidget {
       initialRoute: initialRoute,
       routes: {
         '/': (context) => HomeScreen(),
-        '/folders': (context) => FolderListingScreen(),
         '/settings': (context) => SettingsScreen(),
         '/setupRemoteGit': (context) =>
             GitHostSetupScreen(stateContainer.completeGitHostSetup),
diff --git a/lib/widgets/app_drawer.dart b/lib/widgets/app_drawer.dart
index 2ae89d23..aea47d86 100644
--- a/lib/widgets/app_drawer.dart
+++ b/lib/widgets/app_drawer.dart
@@ -2,12 +2,15 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_email_sender/flutter_email_sender.dart';
-import 'package:gitjournal/analytics.dart';
-import 'package:gitjournal/state_container.dart';
-import 'package:gitjournal/utils.dart';
 import 'package:launch_review/launch_review.dart';
 import 'package:share/share.dart';
 import 'package:url_launcher/url_launcher.dart';
+import 'package:page_transition/page_transition.dart';
+
+import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/state_container.dart';
+import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/screens/folder_listing.dart';
 
 class AppDrawer extends StatelessWidget {
   @override
@@ -87,7 +90,14 @@ class AppDrawer extends StatelessWidget {
               if (m.settings.name == "/folders") {
                 Navigator.pop(context);
               } else {
-                Navigator.popAndPushNamed(context, "/folders");
+                Navigator.pop(context);
+                Navigator.push(
+                  context,
+                  PageTransition(
+                    type: PageTransitionType.fade,
+                    child: FolderListingScreen(),
+                  ),
+                );
               }
             },
           ),
diff --git a/pubspec.lock b/pubspec.lock
index 0cd6377f..edb7c903 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -350,6 +350,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.10"
+  page_transition:
+    dependency: "direct main"
+    description:
+      name: page_transition
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.5"
   path:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 7870df1e..14e93761 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -28,6 +28,7 @@ dependencies:
   dynamic_theme: ^1.0.0
   flushbar: ^1.9.0
   flutter_staggered_grid_view: ^0.3.0
+  page_transition: "^1.1.5"
 
 dev_dependencies:
   flutter_launcher_icons: "^0.7.2"