1 files changed, 10 insertions, 12 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SearchFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SearchFragment.java
index c891da34..eed714af 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SearchFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SearchFragment.java
@@ -7,6 +7,7 @@ import java.util.List;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v4.view.MenuItemCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -125,18 +126,7 @@ public class SearchFragment extends SubsonicFragment implements SectionAdapter.O
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
 		menuInflater.inflate(R.menu.search, menu);
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case R.id.menu_global_search:
-				context.startSearch(currentQuery, false, null, false);
-				return true;
-		}
-
-		return super.onOptionsItemSelected(item);
-
+		onFinishSetupOptionsMenu(menu);
 	}
 
 	@Override
@@ -218,6 +208,14 @@ public class SearchFragment extends SubsonicFragment implements SectionAdapter.O
 			}
 		};
 		task.execute();
+
+		if(searchItem != null) {
+			MenuItemCompat.collapseActionView(searchItem);
+		}
+	}
+
+	protected String getCurrentQuery() {
+		return currentQuery;
 	}
 
 	private void onArtistSelected(Artist artist, boolean autoplay) {