diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index 3184be593..5c170ef45 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -632,6 +632,7 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
             @Override
             public boolean onQueryTextSubmit(String query) {
                 folderMenuItem.collapseActionView();
+                mActionBarTitle.setText(getString(R.string.filter_folders_action));
                 return true;
             }
 
@@ -641,6 +642,15 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
                 return true;
             }
         });
+
+        folderSearchView.setOnCloseListener(new SearchView.OnCloseListener() {
+            
+            @Override
+            public boolean onClose() {
+                mActionBarTitle.setText(getString(R.string.folders_title));
+                return false;
+            }
+        });
     }
 
     @Override public boolean onContextItemSelected(android.view.MenuItem item) {