diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportCreationFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportCreationFragment.kt
index 9fb69d43..35ffa4b3 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportCreationFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportCreationFragment.kt
@@ -47,6 +47,11 @@ class ReportCreationFragment : RealmFragment(), RowRepresentableDataSource, RowR
 		super.onActivityResult(requestCode, resultCode, data)
 		if (requestCode == FilterActivityRequestCode.CREATE_FILTER.ordinal && resultCode == Activity.RESULT_OK) {
 			this.updateUIWithCurrentStep()
+			val selectedFilterId = data?.getStringExtra(FiltersActivity.IntentKey.FILTER_ID.keyName)
+			val filterPosition = currentRows.indexOfFirst { it is Filter && it.id == selectedFilterId }
+			if (filterPosition != -1) {
+				onRowSelected(filterPosition, currentRows[filterPosition])
+			}
 		}
 	}