diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java
index ddce20a22..29d1f5f16 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java
@@ -325,9 +325,7 @@ public final class BookletUtils{
     public static void openIndexEntry(GuiBooklet booklet, IBookletEntry entry, int page, boolean resetTextField){
         if(resetTextField){
             booklet.searchField.setText("");
-            if(entry instanceof BookletEntryAllSearch){
-                entry.setChapters(ActuallyAdditionsAPI.ALL_CHAPTERS);
-            }
+            updateSearchBar(booklet);
         }
 
         if(booklet.currentEntrySet.getCurrentPage() != null){
@@ -385,6 +383,10 @@ public final class BookletUtils{
             if(booklet.currentEntrySet.getCurrentEntry() != null){
                 if(booklet.currentEntrySet.getCurrentChapter() == null){
                     if(place < booklet.currentEntrySet.getCurrentEntry().getChapters().size()){
+                        //Clear the search bar when entering a chapter
+                        booklet.searchField.setText("");
+                        updateSearchBar(booklet);
+
                         IBookletChapter chap = booklet.currentEntrySet.getCurrentEntry().getChapters().get(place+(booklet.chapterButtons.length*booklet.currentEntrySet.getPageInIndex()-booklet.chapterButtons.length));
                         openChapter(booklet, chap, chap.getPages()[0]);
                     }
diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang
index 8e966de3a..37119bccd 100644
--- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang
+++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang
@@ -96,7 +96,7 @@ container.nei.actuallyadditions.coffee.extra.milk=+01:00, -1 Level
 container.nei.actuallyadditions.reconstructor.name=Atomic Reconstructor
 container.nei.actuallyadditions.empowerer.name=Empowerer
 
-container.nei.actuallyadditions.booklet.name=ActAdd Manual
+container.nei.actuallyadditions.booklet.name=Actually Additions Manual
 container.nei.actuallyadditions.booklet.header=The <item>Actually Additions Manual<r> says:
 container.nei.actuallyadditions.booklet.noText=Nothing, apparently! But that doesn't matter. Just click the button on the bottom to see the item inside the booklet and look through its pages to find some fancy stuff!