diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersActivity.kt
index a78e3435..29189791 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersActivity.kt
@@ -64,9 +64,9 @@ class FiltersActivity : PokerAnalyticsActivity() {
 		val filterableType = FilterableType.valueByIdentifier(uniqueIdentifier)
 
 		fragment = FiltersFragment()
+		fragment.setData(filterId, filterableType)
 		fragmentTransaction.add(R.id.container, fragment)
 		fragmentTransaction.commit()
-		fragment.setData(filterId, filterableType)
 		fragment.updateMostUsedFiltersVisibility(!hideMostUsedFilters)
 
 	}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt
index 564fb7ac..c04d3e02 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt
@@ -56,6 +56,14 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 	private var isUpdating = false
 	private var showMostUsedFiltersLayout = true
 
+	/**
+	 * Set fragment data
+	 */
+	fun setData(primaryKey: String?, filterableType: FilterableType) {
+		this.primaryKey = primaryKey
+		this.filterableType = filterableType
+	}
+
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		super.onCreateView(inflater, container, savedInstanceState)
 		return inflater.inflate(R.layout.fragment_filters, container, false)
@@ -289,14 +297,6 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 		activity?.finish()
 	}
 
-	/**
-	 * Set fragment data
-	 */
-	fun setData(primaryKey: String?, filterableType: FilterableType) {
-		this.primaryKey = primaryKey
-		this.filterableType = filterableType
-	}
-
 	/**
 	 * Update the most used filters visibility
 	 */