diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
index 9702f0b9..fa6d129e 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
@@ -26,7 +26,7 @@ import net.pokeranalytics.android.ui.activity.*
 import net.pokeranalytics.android.ui.adapter.FeedSessionRowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.FeedTransactionRowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.fragment.components.RealmFragment
+import net.pokeranalytics.android.ui.fragment.components.FilterableFragment
 import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode
 import net.pokeranalytics.android.ui.interfaces.FilterableType
 import net.pokeranalytics.android.ui.view.RowRepresentable
@@ -36,7 +36,7 @@ import java.text.SimpleDateFormat
 import java.util.*
 
 
-class FeedFragment : RealmFragment(), RowRepresentableDelegate {
+class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
 
 	companion object {
 
@@ -68,7 +68,6 @@ class FeedFragment : RealmFragment(), RowRepresentableDelegate {
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		setFilterable(true)
 		initUI()
 		initData()
 	}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt
index 8879865c..4f89c398 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt
@@ -3,7 +3,6 @@ package net.pokeranalytics.android.ui.fragment.components
 import android.os.Bundle
 import android.view.*
 import androidx.appcompat.widget.Toolbar
-import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.ui.interfaces.FilterHandler
 import net.pokeranalytics.android.ui.interfaces.FilterableType
@@ -15,16 +14,11 @@ import timber.log.Timber
  * - Access to the filters actions (new, select, modify, remove)
  * - ...
  */
-open class FilterableFragment: Fragment(), FilterHandler {
+open class FilterableFragment: RealmFragment(), FilterHandler {
 
 	override var currentFilterable: FilterableType = FilterableType.ALL
 
 	private var filterMenuItem: MenuItem? = null
-	private var displayFilter: Boolean = false
-	set(value) {
-		field = value
-		filterMenuItem?.isVisible = displayFilter
-	}
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		setHasOptionsMenu(true)
@@ -41,7 +35,6 @@ open class FilterableFragment: Fragment(), FilterHandler {
 			filterMenuItem = toolbar.menu?.add(0, R.id.menu_item_filter, 0, R.string.filter)
 			filterMenuItem?.setIcon(R.drawable.ic_outline_filter_list)
 			filterMenuItem?.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
-			filterMenuItem?.isVisible = displayFilter
 		}
 	}
 
@@ -63,10 +56,4 @@ open class FilterableFragment: Fragment(), FilterHandler {
 	override fun removeFilter() {
 	}
 
-	/**
-	 * Set the current fragment as filterable
-	 */
-	fun setFilterable(filterable: Boolean) {
-		this.displayFilter = filterable
-	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt
index 70ff698a..3bbf1d13 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt
@@ -3,12 +3,12 @@ package net.pokeranalytics.android.ui.fragment.components
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.Fragment
 import com.crashlytics.android.Crashlytics
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
-import net.pokeranalytics.android.ui.interfaces.FilterHandler
 
-open class PokerAnalyticsFragment : FilterableFragment(), FilterHandler {
+open class PokerAnalyticsFragment : Fragment() {
 
 	private var loaderDialogFragment: LoaderDialogFragment? = null
 	var parentActivity: PokerAnalyticsActivity? = null