diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
index 1bd58013..71798e66 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
@@ -44,6 +44,7 @@ open class DataListFragment : DeletableItemFragment(), LiveRowRepresentableDataS
 	private lateinit var dataType: LiveData
 	private lateinit var items: RealmResults<out Deletable>
 	private var dataListMenu: Menu? = null
+	private var searchView: SearchView? = null
 
 	var isSearchable: Boolean = false
 	set(value) {
@@ -96,9 +97,9 @@ open class DataListFragment : DeletableItemFragment(), LiveRowRepresentableDataS
 		val searchMenuItem = menu.findItem(R.id.action_search)
 		searchMenuItem.isVisible = isSearchable
 
-		val searchView = searchMenuItem.actionView as SearchView
-		searchView.removeMargins()
-		searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+		searchView = searchMenuItem.actionView as SearchView?
+		searchView?.removeMargins()
+		searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
 			override fun onQueryTextSubmit(query: String?): Boolean {
 				return false
 			}
@@ -131,6 +132,7 @@ open class DataListFragment : DeletableItemFragment(), LiveRowRepresentableDataS
 	}
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) {
+		searchView?.clearFocus()
 
 		when (this.dataType) {
 			LiveData.FILTER -> {