diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
index b0b87ba5..d3bbdb7c 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
@@ -174,7 +174,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
                             public void run() {
                                 setMusicChooser(LIBRARY);
                             }
-                        }, 300);
+                        }, 200);
                         break;
                     case R.id.nav_folders:
                         new Handler().postDelayed(new Runnable() {
@@ -182,7 +182,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
                             public void run() {
                                 setMusicChooser(FOLDERS);
                             }
-                        }, 300);
+                        }, 200);
                         break;
                     case R.id.support_development:
                         new Handler().postDelayed(new Runnable() {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/FolderFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/FolderFragment.java
index 23c6380d..5cb63a61 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/FolderFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/FolderFragment.java
@@ -150,8 +150,6 @@ public class FolderFragment extends AbsMainActivityFragment implements MainActiv
 
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        PreferenceUtil.getInstance(getActivity()).setLastPage(-2);
-
         getMainActivity().setStatusbarColorAuto();
         getMainActivity().setNavigationbarColorAuto();
         getMainActivity().setTaskDescriptionColorAuto();
diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml
index ccde656b..33eba14a 100644
--- a/app/src/main/res/values/strings_activity_settings.xml
+++ b/app/src/main/res/values/strings_activity_settings.xml
@@ -5,7 +5,6 @@
         <item>@string/albums</item>
         <item>@string/artists</item>
         <item>@string/playlists</item>
-        <item>@string/folders</item>
     </string-array>
 
     <string-array name="pref_start_page_list_values">
@@ -14,7 +13,6 @@
         <item>1</item>
         <item>2</item>
         <item>3</item>
-        <item>-2</item>
     </string-array>
 
     <string-array name="pref_general_theme_list_titles">