diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
index 8db3fc0b..8ad64d7a 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
@@ -160,11 +160,12 @@ open class CustomField : RealmObject(), NameManageable, StaticRowRepresentableDa
 	/**
 	 * Add an entry
 	 */
-	fun addEntry() {
+	fun addEntry(): CustomFieldEntry {
 		val entry = CustomFieldEntry()
 		entries.add(entry)
 		sortEntries()
 		updateRowRepresentation()
+		return entry
 	}
 
 	/**
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
index e1b1eae6..07401dde 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
@@ -150,7 +150,6 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 		when (row) {
 			is CustomFieldEntry -> {
 				val data = customField.editDescriptors(row)
-				Timber.d("data: $data")
 				BottomSheetFragment.create(fragmentManager, row, this, data, isClearable = false, isDeletable = true)
 			}
 			else -> super.onRowSelected(position, row, fromAction)
@@ -205,8 +204,9 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 		}
 
 		addItem.setOnClickListener {
-			customField.addEntry()
+			val customFieldEntry = customField.addEntry()
 			rowRepresentableAdapter.notifyDataSetChanged()
+			onRowSelected(-1, customFieldEntry)
 		}
 
 		sortChoices.setOnCheckedChangeListener(object : ChipGroupExtension.SingleSelectionOnCheckedListener() {