diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryFragment.java b/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryFragment.java
index 5c3f2067ff..db15a64f9e 100644
--- a/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryFragment.java
+++ b/app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryFragment.java
@@ -129,6 +129,8 @@ public class LibraryFragment extends BaseRxFragment<LibraryPresenter>
         }
         // Restore active category
         viewPager.setCurrentItem(activeCat, false);
+        TabLayout.Tab tab = tabs.getTabAt(viewPager.getCurrentItem());
+        if (tab != null) tab.select();
 
         // Send the mangas to child fragments after the adapter is updated
         EventBus.getDefault().postSticky(new LibraryMangasEvent(mangas));
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
index abc900b715..91b5299624 100644
--- a/app/src/main/res/layout/toolbar.xml
+++ b/app/src/main/res/layout/toolbar.xml
@@ -7,5 +7,5 @@
     android:background="@color/colorPrimary"
     android:elevation="4dp"
     android:theme="@style/ThemeOverlay.AppTheme.Dark"
-    app:layout_scrollFlags="scroll|enterAlways"
+    app:layout_scrollFlags="scroll|enterAlways|snap"
     app:popupTheme="@style/AppTheme.Popup" />
\ No newline at end of file