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 07401dde..c5d18e73 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
@@ -22,7 +22,6 @@ import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.rowrepresentable.CustomFieldRow
 import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow
 import net.pokeranalytics.android.util.NULL_TEXT
-import timber.log.Timber
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -105,7 +104,6 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		//shouldOpenKeyboard = false
 		initUI()
 	}
 
@@ -157,7 +155,6 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 	}
 
 	override fun onRowValueChanged(value: Any?, row: RowRepresentable) {
-		Timber.d("onRowValueChanged: $row => $value")
 		when (row) {
 			is CustomFieldEntry -> {
 				row.value = value as String? ?: ""
@@ -236,6 +233,11 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 		updateUI()
 		rowRepresentableAdapter.notifyDataSetChanged()
 
+		if (!isUpdating) {
+			rowRepresentableForPosition(0)?.let {
+				onRowSelected(0, it)
+			}
+		}
 	}
 
 	/**