diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java
index b48a156a..50a8ec4d 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java
@@ -133,6 +133,9 @@ public class SearchResultTabActivity extends BaseBarActivity {
         inflater.inflate(R.menu.menu_search, menu);
         SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
         SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
+        if(searchView == null) {
+            return true;
+        }
         if (search != null) {
             searchView.setQuery(search, false);
         }
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTag.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTag.java
index d0027c98..0682ceef 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTag.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTag.java
@@ -170,7 +170,7 @@ public class FragmentMastodonTag extends Fragment {
             Collections.sort(tags, (obj1, obj2) -> Integer.compare(obj2.getWeight(), obj1.getWeight()));
             boolean isInCollection = false;
             for (Tag tag : tags) {
-                if (tag.name.compareToIgnoreCase(search) == 0) {
+                if (tag.name.trim().compareToIgnoreCase(search.trim()) == 0) {
                     isInCollection = true;
                     break;
                 }
diff --git a/app/src/main/res/layouts/mastodon/layout/activity_search_result_tabs.xml b/app/src/main/res/layouts/mastodon/layout/activity_search_result_tabs.xml
index 065e3476..edc6ae61 100644
--- a/app/src/main/res/layouts/mastodon/layout/activity_search_result_tabs.xml
+++ b/app/src/main/res/layouts/mastodon/layout/activity_search_result_tabs.xml
@@ -26,7 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tabGravity="fill"
-        app:tabMode="scrollable" />
+        app:tabMode="auto" />
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/search_viewpager"