diff --git a/Habitica/res/layout/fragment_guild_recyclerview.xml b/Habitica/res/layout/fragment_guild_recyclerview.xml
index 96ef26ad3..173286a5a 100644
--- a/Habitica/res/layout/fragment_guild_recyclerview.xml
+++ b/Habitica/res/layout/fragment_guild_recyclerview.xml
@@ -5,11 +5,6 @@
         android:layout_width="fill_parent"
         android:orientation="vertical">
 
-    <SearchView android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/guild_search_view"
-                android:queryHint="@string/guild_search_hint"/>
-
     <android.support.design.widget.CoordinatorLayout
             xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/coordinatorLayout"
diff --git a/Habitica/res/menu/menu_public_guild.xml b/Habitica/res/menu/menu_public_guild.xml
new file mode 100644
index 000000000..8a28dd72e
--- /dev/null
+++ b/Habitica/res/menu/menu_public_guild.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context="com.habitrpg.android.habitica.ui.activities.MainActivity">
+
+    <item
+            android:id="@+id/action_guild_search"
+            android:title="@string/guild_search_hint"
+            android:orderInCategory="103"
+            android:visible="true"
+            app:showAsAction="always"
+            app:actionViewClass="android.support.v7.widget.SearchView"/>
+</menu>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java
index 8004cc613..71f0d6b95 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java
@@ -4,17 +4,22 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.adapter.social.PublicGuildsRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
 import com.magicmicky.habitrpgwrapper.lib.models.Group;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.SearchView;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.SearchView;
 
 import java.util.List;
 
@@ -40,9 +45,6 @@ public class PublicGuildsFragment extends BaseMainFragment implements SearchView
         if (view == null) {
             view = inflater.inflate(R.layout.fragment_guild_recyclerview, container, false);
 
-            guildSearchView = (SearchView)view.findViewById(R.id.guild_search_view);
-            guildSearchView.setOnQueryTextListener(this);
-
             unbinder = ButterKnife.bind(this, view);
             recyclerView.setLayoutManager(new LinearLayoutManager(this.activity));
             recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
@@ -83,14 +85,28 @@ public class PublicGuildsFragment extends BaseMainFragment implements SearchView
     }
 
     @Override
-    public boolean onQueryTextSubmit(String query) {
-        viewAdapter.getFilter().filter(query);
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_public_guild, menu);
+
+        MenuItem searchItem = menu.findItem(R.id.action_guild_search);
+        guildSearchView = (SearchView)searchItem.getActionView();
+        SearchView.SearchAutoComplete theTextArea = (SearchView.SearchAutoComplete) guildSearchView.findViewById(R.id.search_src_text);
+        theTextArea.setHintTextColor(ContextCompat.getColor(this.activity,R.color.white));
+        guildSearchView.setQueryHint(getString(R.string.guild_search_hint));
+        guildSearchView.setOnQueryTextListener(this);
+
+    }
+
+    @Override
+    public boolean onQueryTextSubmit(String s) {
+        viewAdapter.getFilter().filter(s);
+        UiUtils.dismissKeyboard(this.activity);
         return true;
     }
 
     @Override
-    public boolean onQueryTextChange(String query) {
-        viewAdapter.getFilter().filter(query);
+    public boolean onQueryTextChange(String s) {
+        viewAdapter.getFilter().filter(s);
         return true;
     }
 }